Xml fix, merge problem
Merge pull request #19 from s3rcan/xml-fix

Xml fix, merge problem