matcher

My own modifications of matcher.