Closes sightmachine/shannon#406
Merge pull request #892 from brooksryba/develop

Closes sightmachine/shannon#406