Merge pull request #24 from MechStar/master

 Added support for Match (Issue #5)