Issue 352: XML parsing done