Fix for #390 

I've added a flag so the proxy settings are only used where we want them.  

branched off dev now!