Improved: search handling
Merge pull request #23 from jsilvestre/master

Improved: search handling