Fix Token Extraction

When "charset" is included in Content-Type header, token extraction failed.  This corrects that behaviour.
Condensed Content-Type Validation.
Merge pull request #25 from SailingYYC/patch-1

Fix Token Extraction