Merge remote-tracking branch 'origin/Playground'

Closes #8, #10