new search function
new search function cont
Merge remote-tracking branch 'origin'
commiting to merge - alex