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