Fix tokenization for words containing non-ascii characters
merged pdg/master into develop