closes sightmachine/shannon#242 with the power of awesome
Merge pull request #788 from Tendrid/develop

closes sightmachine/shannon#242 with the power of awesome