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