1.0.6 - improved matching