Closes sightmachine/shannon#386
Merge pull request #886 from brooksryba/develop

Closes sightmachine/shannon#386