Merge pull request #173 from TheOneRing/snor_next