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

Adds match searching to discovery