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