diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 6607829..d3c9500 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -44,7 +44,7 @@ public function getConfigTreeBuilder()
                         ->performNoDeepMerging()
                         ->beforeNormalization()
                             ->ifString()
-                            ->then(function($v) { return array('algorithm' => $v); })
+                            ->then(function ($v) { return array('algorithm' => $v); })
                         ->end()
                         ->children()
                             ->scalarNode('algorithm')->cannotBeEmpty()->end()
diff --git a/DependencyInjection/FOSAdvancedEncoderExtension.php b/DependencyInjection/FOSAdvancedEncoderExtension.php
index a5e5492..4e2e7d2 100644
--- a/DependencyInjection/FOSAdvancedEncoderExtension.php
+++ b/DependencyInjection/FOSAdvancedEncoderExtension.php
@@ -77,7 +77,7 @@ private function createEncoder($config)
                 'arguments' => $arguments,
             );
         }
-        
+
         // message digest encoder
         $arguments = array(
             $config['algorithm'],
diff --git a/composer.json b/composer.json
index 2bbc0ca..2024024 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,12 @@
         "symfony/framework-bundle": "~2.1",
         "symfony/security-bundle": "~2.1"
     },
-    "autoload": {
-        "psr-0": { "FOS\\AdvancedEncoderBundle": "" }
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1.x-dev"
+        }
     },
-    "target-dir": "FOS/AdvancedEncoderBundle"
+    "autoload": {
+        "psr-4": { "FOS\\AdvancedEncoderBundle\\": "" }
+    }
 }