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