init commit
Tokenizer init commit
Merge remote-tracking branch 'origin/Ricardo' into tokenizer