Remove redundant code
Merge branch 'master' into searchengine
Fixed error
Merge pull request #24 from assureit/searchengine

refactor a code and eliminate redundant part