Added Search Funcionality
Merge origin/master