Added some snippets, don't overwrite this commit.
Merge fix