Merge branch 'master' of https://github.com/jarhead06/XML_MaMuRi.git