diff --git a/Dockerfile b/Dockerfile
index d9e85505..e535835a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
 FROM python:2
+
+## Maintainer info
+MAINTAINER Logan Garrett <https://github.com/lngarrett>
+
 COPY . .
 CMD [ "python", "PlexPy.py"]
 
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..588f6243
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,25 @@
+machine:
+  services:
+    - docker
+
+dependencies:
+  cache_directories:
+    - "~/docker"
+  override:
+    - docker info
+    - if [[ -e ~/docker/image.tar ]]; then docker load --input ~/docker/image.tar; fi
+    - docker build -t lngarrett/plexpy .
+    - mkdir -p ~/docker; docker save lngarrett/plexpy > ~/docker/image.tar
+
+test:
+  override:
+    - docker run -d -p 8989:8989 lngarrett/plexpy
+    - sleep 60
+    - curl http://localhost:8181
+    
+deployment:
+  hub: 
+    branch: master
+    commands:
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+      - docker push lngarrett/docker-plexpy