Add option to disable the proxy server
Merge pull request #2 from surfly/master

added option to disable the proxy server