Fixed content type header stuff. fixes #16
Merge branch 'develop'