Playground changes
Merge pull request #381 from priand/playground

Playground changes