Snippet Fixes
Merge pull request #1179 from markewallace/SnippetFixes

Snippet Fixes