Update Snippet.  Fixes #15.  Also, fixes #16 by way of QA