Feature/tokenize

Merged Timo Koch requested to merge feature/tokenize into master

Merge request reports