Merge pull request #2 from vrabaud/fasterMatcherSpedup

another round of speedups
extractor speedups