added proxy options
Merge pull request #93 from daktak/proxy

Behind a Proxy?
Merge pull request #2 from DobyTang/master

merge update