Fix: General Exception
Merge branch 'master' of https://github.com/hashcube/gameplay