Added Search. Close #4