v1.0

improved matching and performance