Also adds an indefinite timeout if the timeout is specified as "None". Signed-off-by: Eric Callahan <arksine.code@gmail.com>