Added support for multibyte strings