Switche to BruteForceMatcher
Merge branch 'databaseImprovement'