fix type in _matches in tokenizer (fixes #294)
Merge remote-tracking branch 'origin/master'