fixing get_features('wikipedia')
Merge remote-tracking branch 'origin/master'