API changes
Merge branch 'master' of github.com:Pixate/Playground