Issue 337: Extract charset out of the correct key=value pair.
Merge pull request #33 from m1key/Issue337

Issue 337: Extract charset out of the correct key=value pair.