diff --git a/Dockerfile.py34 b/Dockerfile
similarity index 59%
rename from Dockerfile.py34
rename to Dockerfile
index a9181fa..0209f2a 100644
--- a/Dockerfile.py34
+++ b/Dockerfile
@@ -3,10 +3,17 @@ MAINTAINER Jim Rybarski <jim@rybarski.com>
 
 RUN mkdir -p /var/nds2
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3-numpy
+    python-numpy \
+    python3-numpy \
+    python-pip \
+    python3-pip
+
+RUN pip install six
+RUN pip3 install six
 
 COPY . /opt/nd2reader
 WORKDIR /opt/nd2reader
+RUN python setup.py install
 RUN python3 setup.py install
 WORKDIR /var/nd2s
 
diff --git a/Dockerfile.py27 b/Dockerfile.py27
deleted file mode 100644
index d2419d3..0000000
--- a/Dockerfile.py27
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM ubuntu
-MAINTAINER Jim Rybarski <jim@rybarski.com>
-
-RUN mkdir -p /var/nds2
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python-numpy
-
-COPY . /opt/nd2reader
-WORKDIR /opt/nd2reader
-RUN python setup.py install
-WORKDIR /var/nd2s
-
-CMD /usr/bin/python2.7
diff --git a/Makefile b/Makefile
index 2438069..89b185e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,8 @@
 build:
 	docker build -t jimrybarski/nd2reader .
 
-shell:
-	docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader
+py2shell:
+	docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python2.7
+
+py3shell:
+	docker run --rm -v ~/Documents/nd2s:/var/nd2s -it jimrybarski/nd2reader python3.4