Issue #161 - Add support for generalizing matches