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