Fix UTF-8 issue

Closes #35