Merge pull request #21 from tkummermehr/EnhanceXmlParser