Merge pull request #770 from zeroadam/TextToXML