Adds match searching to discovery
Merge pull request #336 from lukecampbell/discovery

Adds match searching to discovery