Feature/timeout

@amattn shouldn't this use the timeout you passed in?