Add extended Matching functionality (bug #97)