fixing unicode handling, fixes #26