add proper unicode handling
3 files changed