Updated javadocs
Converted to XPath instead of SAX