Merge pull request #53 from cistov/master

Handling charsets & whitespace when looking up extensions