changed matchin alg. (UNTESTED)
Merge remote-tracking branch 'origin/master'