Basic search function implemented
Merge branch 'Thomas'