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