Handle unicode strings correctly
Merge branch 'dev' of github.com:senshu/Sozi into dev