Playground enhancements
Merge pull request #817 from priand/playground

Playground enhancements