Added Search
Merge commit.