Playground upgrade
Merge pull request #264 from priand/Playground

Playground upgrade