added more unicode support