Merge pull request #69 from Trott/search

Search