Added some Unicode support!