Add comments for snippet
Merge branch 'master' into mac