Merge pull request #22 from assureit/searchengine

Searchengine
Merge branch 'master' into searchengine
stabilize function Search