Tokenizer

Merging with master