Version 2.0, getXML() method added, minor code improvements