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

Change for 2.6
Merge pull request #2 from doadin/jb2.6

update to 2.6 in prep for 3.0