Merging in fixes and improvements from Play (https://github.com/JanX2/Play).
Merge pull request #1 from JanX2/master

Merging in fixes and improvements from Play