Fixed bug issue 1 by rewriting the whole tokenizer.tokenize function