Issue #356 - Fix encoding (UTF-8)