Playground enhancements
Merge pull request #495 from priand/playground

Playground enhancements