#6 Improved the search functionality more
Merge pull request #21 from iordan93/Branch_11e93436b42b0e59e580d3ebbd7b91dff73a8b40

#6 Improved the search functionality more