add unicode support