Implemented simple search
Merge branch 'make-search' into develop