Merge pull request #13 from dmwm/master

Update from master
Fix proxy retrieval.
Merge pull request #4087 from HassenRiahi/FixProxyRetrieval

Fix proxy retrieval