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