Closes sightmachine/shannon#386