#1 Improve unicode support