Merge pull request #1 from JanX2/master

Merging in fixes and improvements from Play