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