Merge pull request #66 from TheOneRing/snore