Merge pull request #883 from bcroq/file-encoding

work on file encoding detection