added unicode support