Merge pull request #159 from WouterJ/fix_xml_namespaces

Fixed xml namespaces
Added missing formats