More flexible ContentType manipulation

fixes #13