Fix charset in content type

@geraintluff
please merge bf4d3e0
and please give me a hint on how to change the behavior to 4c895a8 see #139
Thanks
Ognian