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