Merge pull request #54 from Maaack/updates-from-game-template