Fix some bugs with charset encoding on import
Merge pull request #456 from aurimasv/import-charset

Fix some bugs with charset encoding on import