Added support fot UTF-8