Merge branch 'develop' of https://github.com/markfarrall/csrest into develop