General snippets fixes
Merge pull request #11 from falzhobel/general-fixes

General snippets fixes