Merge pull request #627 from ovatsus/master

Support for non-UTF8 encodings in sample files