Search query support
Merge pull request #7 from Sachaniman/master

Search query support