diff --git a/.travis.yml b/.travis.yml
index fb0a9a2..11cdf11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,27 +10,27 @@ matrix:
 
     # PHP5.6
     - php: 5.6
-      env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.2.x"
+      env: PHALCON_VERSION="3.2.x" SLAYER_VERSION="dev-dev"
     - php: 5.6
-      env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.1.x"
+      env: PHALCON_VERSION="3.1.x" SLAYER_VERSION="dev-dev"
     - php: 5.6
-      env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.0.x"
+      env: PHALCON_VERSION="3.0.x" SLAYER_VERSION="dev-dev"
 
     # PHP7.0
     - php: 7.0
-      env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.2.x"
+      env: PHALCON_VERSION="3.2.x" SLAYER_VERSION="dev-dev"
     - php: 7.0
-      env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.1.x"
+      env: PHALCON_VERSION="3.1.x" SLAYER_VERSION="dev-dev"
     - php: 7.0
-      env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.0.x"
+      env: PHALCON_VERSION="3.0.x" SLAYER_VERSION="dev-dev"
 
     # PHP7.1
     # - php: 7.1
-    #   env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.2.x"
+    #   env: PHALCON_VERSION="3.2.x" SLAYER_VERSION="dev-dev"
     # - php: 7.1
-    #   env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.1.x"
+    #   env: PHALCON_VERSION="3.1.x" SLAYER_VERSION="dev-dev"
     # - php: 7.1
-    #   env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.0.x"
+    #   env: PHALCON_VERSION="3.0.x" SLAYER_VERSION="dev-dev"
 
 env:
   global:
diff --git a/build/ci/build.sh b/build/ci/build.sh
index 36072a6..06f326a 100644
--- a/build/ci/build.sh
+++ b/build/ci/build.sh
@@ -19,7 +19,7 @@ cat .env
 
 
 # require framework based on version
-composer require phalconslayer/framework:${FRAMEWORK_VERSION}
+composer require phalconslayer/framework:dev-${TRAVIS_BRANCH}
 composer require techpivot/phalcon-ci-installer:~1.0
 
 
diff --git a/composer.json b/composer.json
index 00811c8..56c7926 100644
--- a/composer.json
+++ b/composer.json
@@ -27,14 +27,14 @@
         "composer/composer": "^1.0",
         "fzaninotto/faker": "~1.4",
         "guzzlehttp/guzzle": "6.1.*",
-        "illuminate/support": "5.2.*",
+        "illuminate/support": "^5.5",
         "jenssegers/blade": "^1.0",
         "paragonie/random_compat": "1.1.*",
         "league/flysystem": "^1.0",
         "league/tactician": "^0.6",
-        "mailgun/mailgun-php": "~1.7.2",
+        "mailgun/mailgun-php": "2.2.*",
         "monolog/monolog": "^1.15",
-        "robmorgan/phinx": "0.5.*",
+        "robmorgan/phinx": "0.6.*",
         "swiftmailer/swiftmailer": "^5.4",
         "symfony/console": "^2.7",
         "symfony/debug": "^2.7",
diff --git a/src/Clarity/Console/App/ControllerCommand.php b/src/Clarity/Console/App/ControllerCommand.php
index 571c892..d92feef 100644
--- a/src/Clarity/Console/App/ControllerCommand.php
+++ b/src/Clarity/Console/App/ControllerCommand.php
@@ -79,14 +79,15 @@ protected function getNamespace()
      */
     protected function getControllerName($is_path = true)
     {
-        $ret = '%s';
+        $ret = '%s%s';
 
         if ($is_path) {
-            $ret = 'Controllers/%sController.php';
+            $ret = 'Controllers/%s%s.php';
         }
 
         return sprintf(
             $ret,
+            di()->get('dispatcher')->getControllerSuffix(),
             studly_case(
                 str_slug($this->input->getArgument('name'), '_')
             )
@@ -166,6 +167,7 @@ public function slash()
         $this->info('Crafting Controller...');
 
         $controller = $this->getControllerName();
+
         # check controller file if exists, throw error if exists
         if ($app_filesystem->has($module.'/'.$controller)) {
             $this->error(