diff --git a/.gitignore b/.gitignore
index b721bc7d..da76324f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ vendor
 .php_cs
 Tests/Functional/cache
 Tests/Functional/logs
+var
\ No newline at end of file
diff --git a/Controller/MessageController.php b/Controller/MessageController.php
index edb6de97..9fdcfbbc 100644
--- a/Controller/MessageController.php
+++ b/Controller/MessageController.php
@@ -3,14 +3,18 @@
 namespace FOS\MessageBundle\Controller;
 
 use FOS\MessageBundle\Provider\ProviderInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
-class MessageController extends Controller implements ContainerAwareInterface
+class MessageController extends AbstractController
 {
+    public function __construct(ContainerInterface $container)
+    {
+        $this->setContainer($container);
+    }
+
     /**
      * @var ContainerInterface
      */
@@ -162,12 +166,4 @@ protected function getProvider()
     {
         return $this->container->get('fos_message.provider');
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
 }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 1b2d8899..608c2436 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -17,7 +17,7 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
+        $treeBuilder = new TreeBuilder('fos_message');
         $rootNode = $treeBuilder->root('fos_message');
 
         $rootNode
diff --git a/README.md b/README.md
index bf1e6884..8743dcd5 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Documentation
 
 Documentation for this bundle is stored under `Resources/doc` in this repository.
 
-[Read the documentation for the last stable (1.3)][]
+[Read the documentation for the last stable (1.4)][]
 
 License
 -------
@@ -27,4 +27,4 @@ This bundle is under the MIT license. See the complete license in the bundle:
 Resources/meta/LICENSE
 ```
 
-[Read the documentation for the last stable (1.3)]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md
+[Read the documentation for the last stable (1.4)]: https://github.com/FriendsOfSymfony/FOSMessageBundle/blob/master/Resources/doc/00-index.md
diff --git a/Resources/config/config.xml b/Resources/config/config.xml
index 8734dd5a..4b2a7b1f 100644
--- a/Resources/config/config.xml
+++ b/Resources/config/config.xml
@@ -6,6 +6,10 @@
 
     <services>
 
+        <service class="FOS\MessageBundle\Controller\MessageController" id="FOS\MessageBundle\Controller\MessageController" public="true">
+            <argument type="service" id="service_container"/>
+        </service>
+
         <service id="fos_message.sender.default" class="FOS\MessageBundle\Sender\Sender" public="false">
             <argument type="service" id="fos_message.message_manager" />
             <argument type="service" id="fos_message.thread_manager" />
diff --git a/composer.json b/composer.json
index 59cb72b7..3d920c9f 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "symfony/security-bundle": "^2.8.45|^3.0|^4.0",
         "symfony/templating": "^2.8.45|^3.0|^4.0",
         "symfony/browser-kit": "^2.8.45|^3.0|^4.0",
-        "symfony/phpunit-bridge": "^4.0",
+        "symfony/phpunit-bridge": "^4.2.8",
         "doctrine/orm": "^2.0"
     },
     "suggest": {
@@ -45,7 +45,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.3-dev"
+            "dev-master": "1.4-dev"
         }
     }
 }