Add proper Unicode support
Merge remote-tracking branch 'upstream/master'