Major changes to XML
Merge pull request #1 from TehZaner/patch-1

Major changes to XML, from Zaner!