Added utf-8 support