Match API changes
Merge pull request #4 from jedmao/match-api

Match API changes