Added config and corporate proxies support
Fixed merge