Issue #3 - XML support complete