Merge pull request #69 from jmtuley/master

Allow MatchError to take a submatcher