Added initial support for search
Merge branch 'master' into win