Merge pull request #497 from priand/playground

Playground fixed in the extension points