JAXB-172
Merge pull request #17 from marschall/2013-10-21

JAXB-172