Safer search logic
Merge pull request #2 from pedrorgirardi/master

Safer search logic