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