Add search functionality. Issue #32