Issue #4 tokenizer classes