Playground enhancements
Merge pull request #788 from priand/playground

Playground enhancements