Merge pull request #1 from vrabaud/fasterMatcher

speedups
another round of speedups