Adding features.
Merge branch 'master' of https://github.com/nathandelane/scratch