Added support for Match (Issue #5) 

All 114 tests are passing