Merge pull request #178 from TheOneRing/fix_snore_crash