Support for unicode in tokenizer added