Merge pull request #140 from Ferada/search