Fixing performance issue found in 2.5.0

The introduction of support for BOM marker handling created an unwanted side effect when the user does not provide the character encoding of the file being processed: performance is reduced significantly

This version fixes the problem and the performance should be equivalent of previous versions, regardless of the user providing a character encoding explicitly, or the input having a BOM marker.

Relevant issue: #176