Merge pull request #6 from ipa-fxm/hydro_dev

update xmlns + beautifying