switch to jaxb unmarshal
Merge branch 'master' into pull-requests