Added search functionality
Fixes #34