Fixed issue 2013
Fixed new issue
Merge branch 'master' of https://github.com/Zangetsu234/HelloGit into adding_World_Domination