Cleaned code, bug testing

close #61
some bug testing in Match class