Add 'my-snippets' directory
Merge branch 'master' into mac