Merge pull request #1015 from brooksryba/develop

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