Merge pull request #522 from jgowdy/byte-order-marker-fix

Attempt to add fixing of BOMs