Merge pull request #6 from typers/master

Getting synchronised
Adding search functionality
Merge pull request #7 from typers/develop

Adding searching functionality