allow option for bigrams to be considered neighbours
Merge remote-tracking branch 'origin/master'