code refactoring
Merge branch 'master' of https://github.com/ArtificialIntel/Wars-of-the-Future