started search
Merge branch 'master' into search
finished search

added search to cli