Matcher cleanup
Matcher cleanup & Basic checker
Merge branch 'master' of https://github.com/sirolf2009/HardMatch.git