diff --git a/.gitignore b/.gitignore
index 458da2e..5dc363a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .project
 .buildpath
 .idea
+vendor
 
 # OS generated files # // GitHub Recommendation
 ######################
diff --git a/bin/mage b/bin/mage
index 9f6e436..fcad36f 100755
--- a/bin/mage
+++ b/bin/mage
@@ -9,8 +9,6 @@
 * file that was distributed with this source code.
 */
 
-use Mage\Autoload;
-
 date_default_timezone_set('UTC');
 
 $baseDir = dirname(dirname(__FILE__));
@@ -18,10 +16,14 @@ $baseDir = dirname(dirname(__FILE__));
 define('MAGALLANES_VERSION', '1.0.1');
 define('MAGALLANES_DIRECTORY', $baseDir);
 
-// Preload
-require_once $baseDir . '/Mage/Autoload.php';
-$loader = new Autoload();
-spl_autoload_register(array($loader, 'autoLoad'));
+if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
+    require_once __DIR__ . '/../vendor/autoload.php';
+} else {
+    require_once $baseDir . '/Mage/Autoload.php';
+    $loader = new \Mage\Autoload();
+    spl_autoload_register(array($loader, 'autoLoad'));
+}
+
 
 // Clean arguments
 array_shift($argv);
diff --git a/composer.json b/composer.json
index c533d31..4018174 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,13 @@
     "require": {
         "php": ">=5.3"
     },
+    "autoload": {
+        "psr-4": {
+            "Mage\\": "./Mage",
+            "Task\\": ".mage/tasks",
+            "Command\\": ".mage/commands"
+        }
+    },
     "bin": [
         "bin/mage"
     ]