diff --git a/.gitignore b/.gitignore
index 8b80908..66f4d84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,4 @@ mage.phar
 ehthumbs.db
 Icon?
 Thumbs.db
-
-composer.phar
-.idea
\ No newline at end of file
+nbproject
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5d2fb0d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+
+install:
+  - composer install --dev --prefer-source
diff --git a/Mage/Command/BuiltIn/DeployCommand.php b/Mage/Command/BuiltIn/DeployCommand.php
index 943a630..e4e2a78 100644
--- a/Mage/Command/BuiltIn/DeployCommand.php
+++ b/Mage/Command/BuiltIn/DeployCommand.php
@@ -59,6 +59,15 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
      */
     const IN_PROGRESS = 'in_progress';
 
+    /**
+     * Stage where possible throw Rollback Exception
+     * @var array
+     */
+    public $acceptedStagesToRollback = array(
+        AbstractTask::STAGE_POST_RELEASE,
+        AbstractTask::STAGE_POST_DEPLOY
+    );
+
     /**
      * Time the Deployment has Started
      * @var integer
@@ -430,22 +439,46 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
         }
     }
 
-    protected function runRollbackTask(){
+    protected function runRollbackTask(AbstractTask $task){
         $this->getConfig()->reload();
         $hosts = $this->getConfig()->getHosts();
 
-        if (count($hosts) == 0) {
+        Console::output("",1,2);
+        Console::output("Starting the <bold>rollback</bold>",1,1);
+
+        if(!in_array($task->getStage(), $this->acceptedStagesToRollback ) ) {
+            $stagesString = implode(', ',$this->acceptedStagesToRollback);
+            Console::output("<light_purple>Warning!</light_purple> <bold>Rollback during deployment can be called only at the stages: $stagesString <bold>",1);
+            Console::output("<bold>Rollback:<bold> <red>ABORTING</red>",1,3);
+
+        } elseif (count($hosts) == 0) {
             Console::output('<light_purple>Warning!</light_purple> <bold>No hosts defined, unable to get releases.</bold>', 1, 3);
 
         } else {
             $result = true;
-            foreach ($hosts as $host) {
-                $this->getConfig()->setHost($host);
+            foreach ($hosts as $hostKey => $host) {
+                $hostConfig = null;
+                if (is_array($host)) {
+                    $hostConfig = $host;
+                    $host = $hostKey;
+                }
 
+                // Set Host and Host Specific Config
+                $this->getConfig()->setHost($host);
+                $this->getConfig()->setHostConfig($hostConfig);
                 $this->getConfig()->setReleaseId(-1);
-                $task = Factory::get('releases/rollback', $this->getConfig());
+
+                $task = Factory::get(array(
+                        'name'=>'releases/rollback',
+                        'parameters' => array('inDeploy'=>true)
+                    ),
+                    $this->getConfig(),
+                    false,
+                    $task->getStage()
+                );
                 $task->init();
                 $result = $task->run() && $result;
+
             }
             return $result;
         }
@@ -486,8 +519,8 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
                     $result = false;
                 }
             } catch (RollbackException $e) {
-                Console::output('<red>FAIL, Rollback started</red> [Message: ' . $e->getMessage() . ']', 0);
-                $this->runRollbackTask();
+                Console::output('<red>FAIL, Rollback catched</red> [Message: ' . $e->getMessage() . ']', 0);
+                $this->runRollbackTask($task);
                 $result = false;
 
             } catch (ErrorWithMessageException $e) {
diff --git a/Mage/Console.php b/Mage/Console.php
index b9dd97c..8dd7940 100644
--- a/Mage/Console.php
+++ b/Mage/Console.php
@@ -48,6 +48,12 @@ class Console
      */
     private static $logEnabled = true;
 
+    /**
+     * Enables or disables verbose logging
+     * @var boolean
+     */
+    private static $verboseLogEnabled = false;
+
     /**
      * String Buffer for the screen output
      * @var string
@@ -107,6 +113,8 @@ class Console
             self::$logEnabled = $config->general('logging', false);
         }
 
+        self::$verboseLogEnabled = self::isVerboseLoggingEnabled();
+
         // Greetings
         if ($showGreetings) {
             if (!self::$logEnabled) {
@@ -173,15 +181,17 @@ class Console
     {
         self::log(strip_tags($message));
 
-        self::$screenBuffer .= str_repeat("\t", $tabs)
-            . strip_tags($message)
-            . str_repeat(PHP_EOL, $newLine);
+        if (!self::$verboseLogEnabled) {
+            self::$screenBuffer .= str_repeat("\t", $tabs)
+                . strip_tags($message)
+                . str_repeat(PHP_EOL, $newLine);
 
-        $output = str_repeat("\t", $tabs)
-            . Colors::color($message, self::$config)
-            . str_repeat(PHP_EOL, $newLine);
+            $output = str_repeat("\t", $tabs)
+                . Colors::color($message, self::$config)
+                . str_repeat(PHP_EOL, $newLine);
 
-        echo $output;
+            echo $output;
+        }
     }
 
     /**
@@ -227,6 +237,10 @@ class Console
 
             $message = date('Y-m-d H:i:s -- ') . $message;
             fwrite(self::$log, $message . PHP_EOL);
+
+            if (self::$verboseLogEnabled) {
+                echo $message . PHP_EOL;
+            }
         }
     }
 
@@ -286,4 +300,15 @@ class Console
         }
     }
 
+    /**
+     * Check if verbose logging is enabled
+     * @return boolean
+     */
+    protected static function isVerboseLoggingEnabled()
+    {
+        return self::$config->getParameter('verbose', false)
+            || self::$config->general('verbose_logging')
+            || self::$config->environmentConfig('verbose_logging', false);
+    }
+
 }
diff --git a/Mage/Task/BuiltIn/General/ManuallyTask.php b/Mage/Task/BuiltIn/General/ManuallyTask.php
new file mode 100644
index 0000000..aec0279
--- /dev/null
+++ b/Mage/Task/BuiltIn/General/ManuallyTask.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Magallanes package.
+ *
+ * (c) Andrés Montañez <andres@andresmontanez.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Mage\Task\BuiltIn\General;
+
+use Mage\Task\AbstractTask;
+
+/**
+ * Task for running multiple custom commands setting them manually
+ * 
+ * Example of usage:
+ * 
+ * tasks:
+ *    on-deploy:
+ *       - scm/force-update
+ *       - general/manually:
+ *          - find . -type d -exec chmod 755 {} \;
+ *          - find . -type f -exec chmod 644 {} \;
+ *          - chmod +x bin/console
+ *          - find var/logs -maxdepth 1 -type f -name '*.log' -exec chown apache:apache {} \;
+ *       - symfony2/cache-clear
+ *
+ * @author Samuel Chiriluta <samuel4x4@gmail.com>
+ */
+class ManuallyTask extends AbstractTask {
+
+    /**
+     * (non-PHPdoc)
+     * @see \Mage\Task\AbstractTask::getName()
+     */
+    public function getName()
+    {
+        return 'Manually multiple custom tasks';
+    }
+
+    /**
+     * @see \Mage\Task\AbstractTask::run()
+     */
+    public function run()
+    {
+        $result = true;
+        
+        $commands = $this->getParameters();
+
+        foreach ($commands as $command)
+        {
+            $result = $result && $this->runCommand($command);
+        }
+
+        return $result;
+    }
+
+}
diff --git a/Mage/Task/BuiltIn/Releases/RollbackTask.php b/Mage/Task/BuiltIn/Releases/RollbackTask.php
index 7a437fd..1de9831 100644
--- a/Mage/Task/BuiltIn/Releases/RollbackTask.php
+++ b/Mage/Task/BuiltIn/Releases/RollbackTask.php
@@ -55,12 +55,18 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
             $result = $this->runCommandRemote('ls -1 ' . $releasesDirectory, $output);
             $releases = ($output == '') ? array() : explode(PHP_EOL, $output);
 
+            $inDeploy = $this->getParameter('inDeploy',false);
+
             if (count($releases) == 0) {
                 Console::output('Release are not available for <bold>' . $this->getConfig()->getHost() . '</bold> ... <red>FAIL</red>');
 
             } else {
                 rsort($releases);
-                $deleteCurrent = $this->getConfig()->getParameter('deleteCurrent', false);
+                $deleteCurrent = $this->getConfig()->getParameter('deleteCurrent',
+                    $this->getConfig()->deployment('delete-on-rollback',
+                        $this->getConfig()->general('delete-on-rollback',false)
+                    )
+                );
 
                 $releaseIsAvailable = false;
                 if ($this->getReleaseId() == '') {
diff --git a/Mage/Task/BuiltIn/Scm/ForceUpdateTask.php b/Mage/Task/BuiltIn/Scm/ForceUpdateTask.php
index 9d68e09..2b1bfe8 100644
--- a/Mage/Task/BuiltIn/Scm/ForceUpdateTask.php
+++ b/Mage/Task/BuiltIn/Scm/ForceUpdateTask.php
@@ -65,13 +65,13 @@ class ForceUpdateTask extends AbstractTask
                 $remote = $this->getParameter('remote', 'origin');
                 
                 $command = 'git fetch ' . $remote . ' ' . $branch;
-                $result = $this->runCommandRemote($command);
+                $result = $this->runCommand($command);
 
                 $command = 'git reset --hard ' . $remote . '/' . $branch;
-                $result = $result && $this->runCommandRemote($command);
+                $result = $result && $this->runCommand($command);
 
                 $command = 'git pull ' . $remote . ' ' . $branch;
-                $result = $result && $this->runCommandRemote($command);
+                $result = $result && $this->runCommand($command);
                 break;
 
             default:
@@ -79,7 +79,6 @@ class ForceUpdateTask extends AbstractTask
                 break;
         }
 
-        $result = $this->runCommandLocal($command);
         $this->getConfig()->reload();
 
         return $result;
diff --git a/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php b/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php
index 44acc46..d347138 100644
--- a/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php
+++ b/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php
@@ -14,8 +14,13 @@ use Mage\Task\BuiltIn\Symfony2\SymfonyAbstractTask;
 
 /**
  * Task for Clearing the Cache
+ * 
+ * Example of usage:
+ *    symfony2/cache-clear: { env: dev }
+ *    symfony2/cache-clear: { env: dev, optional: --no-warmup }
  *
  * @author Andrés Montañez <andres@andresmontanez.com>
+ * @author Samuel Chiriluta <samuel4x4@gmail.com>
  */
 class CacheClearTask extends SymfonyAbstractTask
 {
@@ -36,8 +41,10 @@ class CacheClearTask extends SymfonyAbstractTask
     {
         // Options
         $env = $this->getParameter('env', 'dev');
+        $optional = $this->getParameter('optional', '');
+
+        $command = $this->getAppPath() . ' cache:clear --env=' . $env . ' ' . $optional;
 
-        $command = $this->getAppPath() . ' cache:clear --env=' . $env;
         $result = $this->runCommand($command);
 
         return $result;
diff --git a/Mage/Task/BuiltIn/Symfony2/DoctrineMigrate.php b/Mage/Task/BuiltIn/Symfony2/DoctrineMigrateTask.php
similarity index 93%
rename from Mage/Task/BuiltIn/Symfony2/DoctrineMigrate.php
rename to Mage/Task/BuiltIn/Symfony2/DoctrineMigrateTask.php
index b76633d..3a412e9 100644
--- a/Mage/Task/BuiltIn/Symfony2/DoctrineMigrate.php
+++ b/Mage/Task/BuiltIn/Symfony2/DoctrineMigrateTask.php
@@ -15,7 +15,7 @@ use Mage\Task\BuiltIn\Symfony2\SymfonyAbstractTask;
 /**
  * Task for Doctrine migrations
  */
-class DoctrineMigrate extends SymfonyAbstractTask
+class DoctrineMigrateTask extends SymfonyAbstractTask
 {
     /**
      * (non-PHPdoc)
@@ -34,7 +34,9 @@ class DoctrineMigrate extends SymfonyAbstractTask
     public function run()
     {
         $env = $this->getParameter('env', 'dev');
+
         $command = $this->getAppPath() . ' doctrine:migrations:migrate -n --env=' . $env;
+        
         return $this->runCommand($command);
     }
 }
diff --git a/composer.json b/composer.json
index 0063d15..27ef259 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,9 @@
         "php": ">=5.3",
         "symfony/filesystem": ">=2.1.0,<=2.6.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.3.5"
+    },
     "autoload": {
         "psr-4": {
             "Mage\\": "./Mage",
diff --git a/composer.lock b/composer.lock
index 54108f8..b341b73 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,21 +4,21 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e7a3fa9a09b1ab45ed140d6813a94262",
+    "hash": "61974b12f91cf9124bfd75a369d20ff8",
     "packages": [
         {
             "name": "symfony/filesystem",
-            "version": "v2.5.6",
+            "version": "v2.6.0",
             "target-dir": "Symfony/Component/Filesystem",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "4e62fab0060a826561c78b665925b37c870c45f5"
+                "reference": "6f7c7e42f20ee200d8ac5d2ec1d2a524138305e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/4e62fab0060a826561c78b665925b37c870c45f5",
-                "reference": "4e62fab0060a826561c78b665925b37c870c45f5",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/6f7c7e42f20ee200d8ac5d2ec1d2a524138305e0",
+                "reference": "6f7c7e42f20ee200d8ac5d2ec1d2a524138305e0",
                 "shasum": ""
             },
             "require": {
@@ -27,7 +27,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -51,10 +51,754 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "http://symfony.com",
-            "time": "2014-09-22 09:14:18"
+            "time": "2014-11-16 17:28:09"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Instantiator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2014-10-13 12:58:55"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.0.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
+                "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "~1.0",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4.1"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2014-12-03 06:41:44"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-10-10 15:34:57"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2014-01-30 17:20:04"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2013-08-02 07:42:54"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876",
+                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2014-08-31 06:12:13"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "2dab9d593997db4abcf58d0daf798eb4e9cecfe1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2dab9d593997db4abcf58d0daf798eb4e9cecfe1",
+                "reference": "2dab9d593997db4abcf58d0daf798eb4e9cecfe1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-code-coverage": "~2.0",
+                "phpunit/php-file-iterator": "~1.3.2",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "~1.0.2",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.0",
+                "sebastian/diff": "~1.1",
+                "sebastian/environment": "~1.0",
+                "sebastian/exporter": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2014-11-11 10:11:09"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "~1.0,>=1.0.1",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.3"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2014-10-03 05:12:11"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "c484a80f97573ab934e37826dba0135a3301b26a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a",
+                "reference": "c484a80f97573ab934e37826dba0135a3301b26a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.1",
+                "sebastian/exporter": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2014-11-16 21:32:38"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "http://www.github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2014-08-15 10:29:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
+                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2014-10-25 08:00:45"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
+                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2014-09-10 00:51:36"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2014-03-07 15:35:33"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.6.1",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
+                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-12-02 20:19:20"
         }
     ],
-    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
diff --git a/docs/commands.txt b/docs/commands.txt
index b9674b4..178bad2 100644
--- a/docs/commands.txt
+++ b/docs/commands.txt
@@ -51,9 +51,11 @@ mage releases rollback --release=-3 to:production
 # Rollback to a specific Release on the Production environment
 # mage releases rollback --release=20120101172148 to:production
 
+# Output logs by adding verbose option to ANY command
+mage deploy to:production --verbose
 
 ### List of UPCOMING Commands ###
 # mage config add host s05.example.com to:[production]
 # mage config git git://github.com/andres-montanez/Zend-Framework-Twig-example-app.git
 # mage config svn svn://example.com/repo
-# mage task:deployment/rsync to:production
\ No newline at end of file
+# mage task:deployment/rsync to:production
diff --git a/docs/example-config/.mage/config/environment/production.yml b/docs/example-config/.mage/config/environment/production.yml
index 5122d7d..97a3fcc 100644
--- a/docs/example-config/.mage/config/environment/production.yml
+++ b/docs/example-config/.mage/config/environment/production.yml
@@ -21,3 +21,4 @@ tasks:
     - privileges
     - sampleTask
     - sampleTaskRollbackAware
+verbose_logging: true
diff --git a/docs/example-config/.mage/config/environment/staging.yml b/docs/example-config/.mage/config/environment/staging.yml
index 5c1c51d..51f4f06 100644
--- a/docs/example-config/.mage/config/environment/staging.yml
+++ b/docs/example-config/.mage/config/environment/staging.yml
@@ -29,3 +29,4 @@ tasks:
 #    - sampleTask
   post-deploy:
     - sampleTask
+verbose_logging: false
diff --git a/docs/example-config/.mage/config/general.yml b/docs/example-config/.mage/config/general.yml
index 3834ff3..c3a9b6d 100644
--- a/docs/example-config/.mage/config/general.yml
+++ b/docs/example-config/.mage/config/general.yml
@@ -3,6 +3,7 @@ name: My fantastic App
 email: andresmontanez@gmail.com
 notifications: true
 logging: true
+verbose_logging: false
 scm:
   type: git
   url:  git://github.com/andres-montanez/Zend-Framework-Twig-example-app.git
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..a5e1c3b
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.0/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         verbose="true"
+         strict="true"
+         colors="false">
+    <testsuite name="small">
+      <directory suffix="Test.php">tests</directory>
+    </testsuite>
+
+    <filter>
+      <whitelist processUncoveredFilesFromWhitelist="true">
+        <directory suffix=".php">src</directory>
+      </whitelist>
+    </filter>
+</phpunit>
+
diff --git a/tests/MageTest/Console/ColorsTest.php b/tests/MageTest/Console/ColorsTest.php
new file mode 100644
index 0000000..2655409
--- /dev/null
+++ b/tests/MageTest/Console/ColorsTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace MageTest\Console;
+
+use Mage\Console\Colors;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @group Mage_Console_Colors
+ */
+class ColorsTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @group 159
+     */
+    public function testColor()
+    {
+        $config = $this->getMock('Mage\Config');
+        $config->expects($this->once())
+            ->method('getParameter')
+            ->will($this->returnValue(false));
+
+        $string = '<green>FooBar</green>';
+
+        // Method need to be non static in the future
+        $result = Colors::color($string, $config);
+        $expected = "\033[0;32mFooBar\033[0m";
+
+        $this->assertSame($expected, $result);
+    }
+
+    /**
+     * @group 159
+     */
+    public function testColorNoColor()
+    {
+        $config = $this->getMock('Mage\Config');
+        $config->expects($this->once())
+            ->method('getParameter')
+            ->will($this->returnValue(true));
+
+        $string = '<black>FooBar</black>';
+
+        // Method need to be non static in the future
+        $result = Colors::color($string, $config);
+        $expected = 'FooBar';
+
+        $this->assertSame($expected, $result);
+    }
+
+    /**
+     * @group 159
+     */
+    public function testColorUnknownColorName()
+    {
+        $config = $this->getMock('Mage\Config');
+        $config->expects($this->once())
+            ->method('getParameter')
+            ->will($this->returnValue(false));
+
+        $string = '<foo>FooBar</foo>';
+
+        // Method need to be non static in the future
+        $result = Colors::color($string, $config);
+
+        $this->assertSame($string, $result);
+    }
+}