Merge pull request #787 from dblevins/jaxrs

Jaxrs