Merge pull request #86 from geogrep/pete/search-api

Pete/search api