Merge pull request #81 from hmert/master

merge and search