Merge pull request #81 from hmert/master

merge and search
Merge pull request #24 from okulbilisim/master

Merge pull request #81 from hmert/master