Added naïve detection of proxy.
Fixed merge conflict for proxy detection