Resolves Issue #23, also search timeout is configurable