Add proper Unicode support