changes to bugfix based on further work in XML_Util
Merge pull request #3 from ashnazg/bug18343

changes to bugfix based on further work in XML_Util