Merge pull request #988 from ahomatthew/develop

Develop
optimization
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop