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