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