Closes #222
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #784 from ahomatthew/develop

Develop