added new tokenizer regexp