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