Better handling of req Content Type
Merge branch 'hotfix/0.5.1'