XML parsing fixed, initial version