add option to account for rare words
Merge remote-tracking branch 'origin/master'