Merge pull request #122 from oxylusengine/play_fixes