improve proxy support
Merge pull request #692 from blueboxgroup/feature/proxy_support

improve proxy support