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