unicode support
Merge branch 'gotlium-master'