non-latin names better with range of token sizes; also integrated into example
Merge branch 'master' into prod