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