Merge pull request #1166 from brooksryba/develop

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