Add proxy support
Merge pull request #210 from xophm1/develop

Add proxy support