Improve unicode support

Continue working on #86.