Merge pull request #108 from dagwieers/xml-prepare-upstream

Changes to prepare for being upstreamed

Author: cmprescott