diff --git a/README.md b/README.md
index bf65785..bf5e75e 100644
--- a/README.md
+++ b/README.md
@@ -14,15 +14,14 @@
 
                                        )))    
                                       (o o)    
-    ----  PyroCMS Deploy Tool --- ooO--(_)--Ooo ----
-
+    ----  PyroCMS Deploy Tool v1.2 --- ooO--(_)--Ooo ----
 ```
 
 > This is a [PyroCMS 3](https://www.pyrocms.com/) deploy tool with customization, install automation, better version control setup and other nice-to-have features.
 
 ## Get Started
 
-Auto-pyro downloads, configure, install and deploy a complete Pyro app with all required addons and packages. It automatically installs [Pyro Builder](https://github.com/websemantics/builder-extension) and comes pre-configured with a [todo module](#todo-module) out of the box.
+Auto-pyro downloads, configures, installs and deploys a complete Pyro app with optional / required addons and packages. It automatically installs [Pyro Builder](https://github.com/websemantics/builder-extension) and comes pre-configured with a [todo module](#todo-module) example out of the box.
 
 Here's a video to demonstrate how it works (click on the image)
 
@@ -57,6 +56,14 @@ ant
 
 Set back until the deploy process is complete. Browse to the project to view, for example, http://my-app.dev.
 
+A setup switch `setup` is available for you to only install Pyro.
+
+```bash
+ant -Dsetup=false
+```
+
+The deploy process will skip cloning PyroCMS repo, requiring plugins and composer packages.
+
 ## Todo Module
 
 This is a simple module that is used to demonstrate features of Auto-pyro and [Pyro Builder](https://github.com/websemantics/builder-extension),
@@ -131,7 +138,7 @@ Here's a quick list of the PyroCOM Environment properties,
 | DB_DATABASE | `pyro` | Set to `pyro` by default |
 | DB_USERNAME | `root` | Change as appropriate |
 | DB_PASSWORD | `root` | Change as appropriate |
-| DB_DRIVER | `mysql` | Set to `mysql` by default |
+| DB_CONNECTION | `mysql` | Set to `mysql` by default |
 | DB_HOST | `localhost` | Set to `localhost` by default |
 | APP_KEY | `r!a#n^d*o?m` | Auto generated |
 | APP_ENV | `local` | Change as appropriate |
diff --git a/build.xml b/build.xml
index a8a8d03..373131a 100644
--- a/build.xml
+++ b/build.xml
@@ -13,7 +13,7 @@
 #       |     |         |     |     |     | \    \      \    `-.-.-'    /
 #       |_____|         |_____|     |_____|  \____\      '-_        _-'
 #                                                           `- - - '
-#       PyroCMS Deploy Tool v1.1
+#       PyroCMS Deploy Tool v1.2
 #
 #       This build file is desgined to automate the installation process
 #       of PyroCMS 3 apps, their addons, underlying framework (i.e. Laravel,
@@ -305,28 +305,35 @@
     # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
     <target name="composer-dependencies" depends="require-pyro" description="Require and remove composer packages">
+        
+        <if>
+          <equals arg1="${setup}" arg2="true"/>
+          <then>
 
-        <echo message="Run composer ..."/>
+            <echo message="Run composer ..."/>
 
-        <exec dir="${app.dir}" executable="${env.COMPOSER.bin}">
-            <arg line="install"/>
-        </exec>
+            <exec dir="${app.dir}" executable="${env.COMPOSER.bin}">
+                <arg line="install"/>
+            </exec>
 
-        <for list="${env.COMPOSER.require}" param="package">
-            <sequential>
-                <exec dir="${app.dir}" executable="${env.COMPOSER.bin}">
-                    <arg line="require @{package}"/>
-                </exec>
-            </sequential>
-        </for>
+            <for list="${env.COMPOSER.require}" param="package">
+                <sequential>
+                    <exec dir="${app.dir}" executable="${env.COMPOSER.bin}">
+                        <arg line="require @{package}"/>
+                    </exec>
+                </sequential>
+            </for>
 
-        <for list="${env.COMPOSER.remove}" param="package">
-            <sequential>
-                <exec dir="${app.dir}" executable="${env.COMPOSER.bin}">
-                    <arg line="remove @{package}"/>
-                </exec>
-            </sequential>
-        </for>
+            <for list="${env.COMPOSER.remove}" param="package">
+                <sequential>
+                    <exec dir="${app.dir}" executable="${env.COMPOSER.bin}">
+                        <arg line="remove @{package}"/>
+                    </exec>
+                </sequential>
+            </for>
+
+          </then>
+        </if>
 
     </target>
 
@@ -338,49 +345,56 @@
 
     <target name="require-pyro" depends="clean" description="Clone PyroCMS and copy its files to project folder">
 
-        <echo message="Clone a fresh copy of pyrocms ... "/>
-
-        <exec dir="${app.dir}" executable="${env.GIT.bin}">
-            <arg line="clone"/>
-            <arg line="-b"/>
-            <arg line="${env.PYRO.branch}"/>
-            <arg line="${env.PYRO.repo}"/>
-            <arg line="${pyro.dir}"/>
-        </exec>
-
-        <echo message="Move PyroCMS files into the project folder ..."/>
-
-        <!-- move root folders -->
-        <for list="${env.PYRO_FOLDERS}" param="folder">
-            <sequential>
-                <move file="${pyro.dir}/@{folder}" todir="${app.dir}" includeEmptyDirs="yes" failonerror="${failonerror}" quiet="${quiet}"/>
-            </sequential>
-        </for>
-
-        <!-- move folders inside public -->
-        <for list="${env.PUBLIC_FOLDERS}" param="folder">
-            <sequential>
-                <move file="${pyro.dir}/public/@{folder}" todir="${app.dir}/public" includeEmptyDirs="yes" failonerror="${failonerror}" quiet="${quiet}"/>
-            </sequential>
-        </for>
+        <if>
+          <equals arg1="${setup}" arg2="true"/>
+          <then>
 
-        <!-- move root folder files -->
-        <for list="${env.ROOT_FILES}" param="file">
-            <sequential>
-                <move file="${pyro.dir}/@{file}" todir="${app.dir}" failonerror="${failonerror}" quiet="${quiet}"/>
-            </sequential>
-        </for>
+            <echo message="Clone a fresh copy of pyrocms ... "/>
+
+            <exec dir="${app.dir}" executable="${env.GIT.bin}">
+                <arg line="clone"/>
+                <arg line="-b"/>
+                <arg line="${env.PYRO.branch}"/>
+                <arg line="${env.PYRO.repo}"/>
+                <arg line="${pyro.dir}"/>
+            </exec>
+
+            <echo message="Move PyroCMS files into the project folder ..."/>
+
+            <!-- move root folders -->
+            <for list="${env.PYRO_FOLDERS}" param="folder">
+                <sequential>
+                    <move file="${pyro.dir}/@{folder}" todir="${app.dir}" includeEmptyDirs="yes" failonerror="${failonerror}" quiet="${quiet}"/>
+                </sequential>
+            </for>
+
+            <!-- move folders inside public -->
+            <for list="${env.PUBLIC_FOLDERS}" param="folder">
+                <sequential>
+                    <move file="${pyro.dir}/public/@{folder}" todir="${app.dir}/public" includeEmptyDirs="yes" failonerror="${failonerror}" quiet="${quiet}"/>
+                </sequential>
+            </for>
+
+            <!-- move root folder files -->
+            <for list="${env.ROOT_FILES}" param="file">
+                <sequential>
+                    <move file="${pyro.dir}/@{file}" todir="${app.dir}" failonerror="${failonerror}" quiet="${quiet}"/>
+                </sequential>
+            </for>
+
+            <!-- move files from public folder -->
+            <move todir="${app.dir}/public">
+                <fileset dir="${pyro.dir}/public">
+                    <include name="**/*.*"/>
+                </fileset>
+            </move>
 
-        <!-- move files from public folder -->
-        <move todir="${app.dir}/public">
-            <fileset dir="${pyro.dir}/public">
-                <include name="**/*.*"/>
-            </fileset>
-        </move>
+            <echo message="Remove PyroCMS temporary folder ..."/>
 
-        <echo message="Remove PyroCMS temporary folder ..."/>
+            <delete dir="${pyro.dir}" failonerror="${failonerror}"/>
 
-        <delete dir="${pyro.dir}" failonerror="${failonerror}"/>
+          </then>
+        </if>
 
     </target>
 
@@ -417,6 +431,7 @@
         <property name="pyro.dir" value="${app.dir}/pyro"/>
         <property name="laravel.dir" value="${app.dir}/laravel"/>
         <property name="env.file" value="${app.dir}/.env"/>
+        <property name="setup" value="true"/>
 
         <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         #  D A T A B A S E   P R O P E R T I E S
diff --git a/local.properties b/local.properties
index 1d4040d..3474df4 100644
--- a/local.properties
+++ b/local.properties
@@ -12,7 +12,7 @@
 #       |     |         |     |     |     | \    \      \    `-.-.-'    /
 #       |_____|         |_____|     |_____|  \____\      '-_        _-'
 #                                                           `------'
-#       PyroCMS Deploy Tool v1.1
+#       PyroCMS Deploy Tool v1.2
 #
 ################################################################################
 #
@@ -20,6 +20,7 @@
 #
 ################################################################################
 
+
 #---------------------------------------
 # PyroCMS repository and default branch
 #---------------------------------------
@@ -36,7 +37,7 @@ env.APP_URL=${env.APPLICATION_NAME}.dev
 env.ADMIN_USERNAME=admin
 env.ADMIN_EMAIL=admin@admin.com
 env.ADMIN_PASSWORD=secret
-env.DB_DATABASE=autopyro
+env.DB_DATABASE=mcwap
 env.DB_USERNAME=root
 env.DB_PASSWORD=root
 env.DB_CONNECTION=mysql
@@ -117,6 +118,8 @@ env.APP_ADDONS=
 # @var DB_DROP, if true, drop the database, env.DB_DATABASE if exists
 # @var LIQUIBASE, if true, download libraries and setup for use (http://www.liquibase.org/)
 #---------------------------------------
+
+
 env.DEBUG=true
 env.DB_DROP=true
 env.LIQUIBASE=false
diff --git a/vagrant.xml b/vagrant.xml
index a1f085b..eca0f0c 100644
--- a/vagrant.xml
+++ b/vagrant.xml
@@ -14,7 +14,7 @@
 #       |     |         |     |     |     | \    \      \    `-.-.-'    /
 #       |_____|         |_____|     |_____|  \____\      '-_        _-'
 #                                                           `- - - '
-#       PyroCMS Deploy Tool v1.1
+#       PyroCMS Deploy Tool v1.2
 #
 #       This vagrant build file is still work in progress.
 #