Issue #10 tokenize method fixed