update xml parser
Merge branch 'master' into public