Fix Merge
rename get proxy config data method
update http proxy parameter names
Merge pull request #94 from andylyall/develop

Develop