Improved XML support and enabling improves
Merge pull request #141 from WouterJ/patch-2

Improved XML support and enabling improves