working on search
Merge branch 'opencv' into search
Merge branch 'search' into opencv