diff --git a/Dockerfile b/Dockerfile
index 7b13e7d..d79571f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,12 @@ MAINTAINER Rafael <rafael@thestorm.com.br>)
 RUN \
     rm -rf /app/* && \
     apt-get update && \
-    apt-get install -y wget php5-gd && \
+    apt-get install -y wget php5-gd unzip && \
     rm -rf /var/lib/apt/lists/* && \
-    wget https://github.com/ethicalhack3r/DVWA/archive/v1.9.zip -O dvwa.tar.gz && \
-    tar -xf dvwa.tar.gz && \
-    cp -r DVWA-master/* /app/ && \
-    rm -rf DVWA-master && \
-    rm -rf dvwa.tar.gz
+    wget https://github.com/ethicalhack3r/DVWA/archive/v1.9.zip -O dvwa.zip && \
+    unzip dvwa.zip && \
+    cp -r DVWA-1.9/* /app/ && \
+    rm -rf DVWA-1.9 dvwa.zip
 
 # Fix some issues about default lamp installation
 RUN \
diff --git a/README.md b/README.md
index 442d076..2f97ffa 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@ docker build -t dvwa:1.9 .
 
 ## Run
 
-docker run -d -p 80:80 -p 3306:3306 dvwa:1.9
+docker run -d --name dvwa -p 80:80 -p 3306:3306 dvwa:1.9 || docker start dvwa