Fix-bug-and-add-unicode-support