Adding a new feature and a bug fix
Merge branch 'dev' of https://github.com/marklogic/roxy into dev