Merge pull request #1 from AiBattleground/master

Updating from AiBattleground