search improvement
Merge pull request #114 from benitoro/master

search improvement