Fixing handling of UTF-8 handling (ref Issue #1)