Fix/Match
from arco
Merge pull request #1 from doadin/master

Change for 2.6