unicode support added