Minor fix in FeatureExtractor
Merge origin/master