diff --git a/Mage/Config.php b/Mage/Config.php
index 98fc9cf..ffc3310 100644
--- a/Mage/Config.php
+++ b/Mage/Config.php
@@ -13,9 +13,14 @@ class Mage_Config
         if (($environment != '') && file_exists('.mage/config/environment/' . $environment . '.yml')) {
             $this->_environment = spyc_load_file('.mage/config/environment/' . $environment . '.yml');
             $this->_environmentName = $environment;
+            
+            // Create temporal directory for clone
             if (is_array($this->_environment['deployment']['source'])) {
-                $newTemporal = $this->_environment['deployment']['source']['temporal']
-                             . md5(microtime()) . '/';
+                if (trim($this->_environment['deployment']['source']['temporal']) == '') {
+                    $this->_environment['deployment']['source']['temporal'] = '/tmp';
+                }
+                $newTemporal = rtrim($this->_environment['deployment']['source']['temporal'], '/')
+                             . '/' . md5(microtime()) . '/';
                 $this->_environment['deployment']['source']['temporal'] = $newTemporal;
             }            
         }
diff --git a/bin/mage b/bin/mage
index fb88ab4..3c590d6 100755
--- a/bin/mage
+++ b/bin/mage
@@ -1,5 +1,5 @@
 #!/bin/sh
-#VERSION:0.9.8
+#VERSION:0.9.9
 
 SCRIPT=$(readlink -f $0)
 DIR=$(dirname $SCRIPT)
diff --git a/bin/mage.php b/bin/mage.php
index 03f3733..882ed43 100644
--- a/bin/mage.php
+++ b/bin/mage.php
@@ -24,7 +24,7 @@ date_default_timezone_set('UTC');
 
 $baseDir = dirname(dirname(__FILE__));
 
-define('MAGALLANES_VERSION', '0.9.8');
+define('MAGALLANES_VERSION', '0.9.9');
 
 require_once $baseDir . '/Mage/spyc.php';
 require_once $baseDir . '/Mage/Autoload.php';