OK.

Would you mind resubmitting a pull request with just the timeout-related changes, then? I'll accept that. Please also update the docs.