optimization
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Cleanup
Merge pull request #989 from ahomatthew/develop

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