Close #14 Fix broken snippets