bump default timeout to 15s
Merge remote-tracking branch 'upstream/master' into search-method
Merge pull request #14 from APMG/search-method

Increase default timeout