Merge pull request #68 from Trott/search

Search