Allow search timeout
Merge pull request #398 from jesushernandez/feature/search_timeout

Allow search timeout