Merge branch '1.7'

This closes #35
tree: 946c4c0731034cc3d0f1814c590d46a61559c5e1
  1. src/
  2. .gitignore
  3. pom.xml