Add better search
Merge pull request #2 from CNagra/feature/better-search

Add better search