Issue 276-Modify the search API
Merge pull request #279 from Chiene/master

Issue 276-Modify the search API