diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..3bbddaf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM golang:1.7.4-alpine
+
+ADD server.go $GOPATH/src/fake-quoteserv/server.go
+
+RUN go build \
+  -o $GOPATH/bin/fake-quoteserv \
+  $GOPATH/src/fake-quoteserv/server.go
+
+EXPOSE 4443
+
+CMD $GOPATH/bin/fake-quoteserv
diff --git a/README.md b/README.md
index e60ad99..00bdc69 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ AFAIK the quote server has no published API or other docs ([this][quote-server-c
 _TBD_
 
 #### Local Usage
-Start the server and stablish a socket connection and send a formatted req `stock_symbol,user_id`:
+Start the server, establish a socket connection and send a formatted request: `stock_symbol,user_id`.
 ```bash
 go run server.go
 
@@ -19,7 +19,7 @@ echo "XYZ,cool_user" | nc localhost 4443
 # server sends
 729.99,XYZ,cool_user,1484459366,WFlaY29vbF91c2Vy77+9
 ```
-Return format is `quote,stock_symbol,user_id,timestamp,cryptokey`.
+Return format is: `quote,stock_symbol,user_id,timestamp,cryptokey`.
 
 [go-tcp-server-blog]: https://coderwall.com/p/wohavg/creating-a-simple-tcp-server-in-go
 [quote-server-client]: http://www.ece.uvic.ca/~seng462/ProjectWebSite/ClientThread.py
diff --git a/makefile b/makefile
new file mode 100644
index 0000000..4afd436
--- /dev/null
+++ b/makefile
@@ -0,0 +1,25 @@
+IMG_NAME = quoteserv
+PORT = 4443
+
+.PHONY: run start stop clean tail
+
+run:
+	docker run \
+	--publish $(PORT):$(PORT) \
+	--name $(IMG_NAME) \
+	--detach \
+	fake-quoteserv
+
+	docker ps
+
+start:
+	docker start $(IMG_NAME)
+
+stop:
+	docker stop $(IMG_NAME)
+
+clean: stop
+	docker rm $(IMG_NAME)
+
+tail:
+	docker logs -f $(IMG_NAME)