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