Fix cases where file encoding was not handled properly in the tool (fixes #563)
Merge pull request #618 from sharwell/fix-563

Fix cases where file encoding was not handled properly in the tool