UTF-8 support added