refactor xml loading
Merge branch 'master' of https://github.com/jongsml/moro