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