Support for Timeout
Return error variable
Doc added