Merge pull request #14 from puneet/master

Merged develop branch into master
Fixed Search.