Added search closes #23