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