Merge pull request #492 from Maaack/simpler-game-scene