diff --git a/Makefile b/Makefile
index f44bee8..9bac217 100644
--- a/Makefile
+++ b/Makefile
@@ -124,12 +124,12 @@ lint:
 	#go tool vet -composites=false **/*.go
 
 travis-test: lint
-	GOMAXPROCS=1 ginkgo -r -cover
+	ginkgo -r -cover
 
 # running ginkgo twice, sadly, the problem is that -cover modifies the source code with the effect
 # that if there are errors the output of gingko refers to incorrect line numbers
 # tip: if you don't like colors use ginkgo -r -noColor
 test: lint
-	ginkgo -r
+	ginkgo -r -v
 	ginkgo -r -cover
 	go tool cover -func=`basename $$PWD`.coverprofile
diff --git a/README.md b/README.md
index 1036808..22f6e28 100644
--- a/README.md
+++ b/README.md
@@ -129,6 +129,10 @@ Or to allow access to www.example.com and blog.example.com over http you might u
 
 Note the use of -server and -regexp, this is because the server named in -server is used when there is no X-Host header. The host in the -server option does not have to match the regexp but it is recommended for it match.
 
+### Using a Proxy
+
+WStunnel client may use a proxy as long as that proxy supports HTTPS CONNECT. Basic authentication may be used if the username and password are embedded in the url. For example, `-proxy http://myuser:mypass@proxy-server.com:3128`. In addition, the command line client will also respect the https_proxy/http_proxy environment variables if they're set. As websocket connections are very long lived, please set read timeouts on your proxy as high as possible. 
+
 ### Using Secure Web Sockets (SSL)
 
 WStunnel does not support SSL natively (although that would not be a big change). The recommended