Xml parser merge into master