Make the document adopt the new XML nodes.
Merge pull request #67 from peterp/patch-1

Make the document adopt the new XML nodes.