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