In rare situations, _matchResidue() would take a very long time to return
Merge pull request #140 from peastman/master

In rare situations, _matchResidue() would take a very long time to return