Fixes sightmachine/shannon #282
Merge branch 'develop' of github.com:sightmachine/SimpleSeer into develop
Merge pull request #821 from brooksryba/develop

Develop