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