Fixed #41 and #39
Merge branch 'master' of https://github.com/GosuSheep/battleguide