removed Matcher class as it became obsolete