diff --git a/.gitignore b/.gitignore
index 33d5456..51c1f80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 README.md.asc
 eeProxy
+eeProxy.app
+eeProxy.exe
diff --git a/Makefile b/Makefile
index 584fed2..f67e66f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,19 @@
 
+GO_COMPILER_OPTS = -a -tags netgo -ldflags '-w -extldflags "-static"'
+
 build:
-	go build
+	go build $(GO_COMPILER_OPTS)
+
+all: linux osx windows
+
+linux:
+	GOOS=linux go build $(GO_COMPILER_OPTS) -o eeProxy
+
+osx:
+	GOOS=darwin go build $(GO_COMPILER_OPTS) -o eeProxy.app
+
+windows:
+	GOOS=windows go build $(GO_COMPILER_OPTS) -o eeProxy.exe
 
 fmt:
 	find . -name '*.go' -exec gofmt -w {} \;
@@ -10,3 +23,8 @@ clean:
 
 deps:
 	go get -u github.com/eyedeekay/eeproxy
+
+test:
+	mkdir -p testdir && cd testdir && \
+		../eeProxy
+
diff --git a/conn/conn.go b/conn/conn.go
index 4c50e85..ab8a3d2 100644
--- a/conn/conn.go
+++ b/conn/conn.go
@@ -80,9 +80,9 @@ func (m Conn) Cleanup() error {
 	if err := m.SAMConn.Close(); err != nil {
 		return err
 	}
-	if err := m.StreamSession.Close(); err != nil {
-		return err
-	}
+	//if err := m.StreamSession.Close(); err != nil {
+	//return err
+	//}
 	return nil
 }