Merge branch 'release/0.1.4' into develop
Properly handle restful vs non restful
Update readme with new version
Merge branch 'release/0.1.5'