Adding support for HTTP_PROXY and HTTPS_PROXY