Feature addition: Change content-type

Re-submit of issue #27