UTF-8/Unicode support fixed.