diff --git a/.travis.yml b/.travis.yml
index 6ba7bab..c2339a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,24 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-
-
-matrix:
-  allow_failures:
-    - php: 5.5
-
-before_script:
-  - composer install --dev --prefer-source
-
-script: phpunit --coverage-text
-
-notifications:
-  email:
-    - helios.ag@gmail.com
\ No newline at end of file
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+
+matrix:
+  allow_failures:
+    - php: 5.6
+    - hhvm
+
+before_script:
+- travis_retry composer self-update
+- travis_retry composer install --dev --prefer-source
+
+script: phpunit --coverage-text
+
+notifications:
+  email:
+    - helios.ag@gmail.com
+
diff --git a/Command/DumpEmoticonsCommand.php b/Command/DumpEmoticonsCommand.php
index 9eff8e6..63acda5 100644
--- a/Command/DumpEmoticonsCommand.php
+++ b/Command/DumpEmoticonsCommand.php
@@ -31,7 +31,7 @@ protected function configure()
      * @param $src
      * @param $dst
      */
-    private function recurse_copy($src,$dst)
+    private function recurseCopy($src,$dst)
     {
             $dir = opendir($src);
             @mkdir($dst);
@@ -62,11 +62,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $emoticonsFolder = $this->getContainer()->getParameter('kernel.root_dir').$input->getOption('emoticons-folder');
 
-        if (!file_exists($emoticonsFolder) and !is_dir($emoticonsFolder)) {
+        if (!file_exists($emoticonsFolder) && !is_dir($emoticonsFolder)) {
             return $output->writeln('<error>Emoticons folder does not exist</error>');
         }
 
-        $this->recurse_copy($emoticonsFolder,$webFolder);
+        $this->recurseCopy($emoticonsFolder,$webFolder);
 
         $output->writeln('<comment>Emoticons dumped succesfully</comment>');
     }
diff --git a/Composer/ScriptHandler.php b/Composer/ScriptHandler.php
index a066d32..c30405d 100644
--- a/Composer/ScriptHandler.php
+++ b/Composer/ScriptHandler.php
@@ -2,7 +2,6 @@
 
 namespace FM\BbcodeBundle\Composer;
 
-use Symfony\Component\Process\Process;
 use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler as BaseHandler;
 
 /**
@@ -21,3 +20,4 @@ public static function installEmoticons($event)
     }
 
 }
+
diff --git a/Decoda/Decoda.php b/Decoda/Decoda.php
index 6063d99..f3933d9 100644
--- a/Decoda/Decoda.php
+++ b/Decoda/Decoda.php
@@ -2,7 +2,6 @@
 
 namespace FM\BbcodeBundle\Decoda;
 
-use Decoda\Component;
 use Decoda\Loader\DataLoader;
 use Decoda\Loader;
 use Decoda\Hook;
diff --git a/Decoda/Hook/EmoticonHook.php b/Decoda/Hook/EmoticonHook.php
index 8d507ab..c00faf3 100644
--- a/Decoda/Hook/EmoticonHook.php
+++ b/Decoda/Hook/EmoticonHook.php
@@ -8,7 +8,6 @@
 
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\ConfigCache;
 
 use Decoda\Decoda;
diff --git a/Emoticon/EmoticonCollection.php b/Emoticon/EmoticonCollection.php
index c99415d..5298821 100644
--- a/Emoticon/EmoticonCollection.php
+++ b/Emoticon/EmoticonCollection.php
@@ -185,4 +185,5 @@ public function addResource(ResourceInterface $resource)
     {
         $this->resources[] = $resource;
     }
-}
\ No newline at end of file
+}
+
diff --git a/Emoticon/Loader/YamlFileLoader.php b/Emoticon/Loader/YamlFileLoader.php
index 0abdd10..4921757 100644
--- a/Emoticon/Loader/YamlFileLoader.php
+++ b/Emoticon/Loader/YamlFileLoader.php
@@ -82,7 +82,7 @@ private function validate($content, $file)
         }
 
         if (!is_array($content)) {
-            throw new InvalidArgumentException(sprintf('The emoticon file "%s" is not valid.', $file));
+            throw new \InvalidArgumentException(sprintf('The emoticon file "%s" is not valid.', $file));
         }
 
         return $content;
diff --git a/Emoticon/Matcher/Matcher.php b/Emoticon/Matcher/Matcher.php
index 459f090..1c45c23 100644
--- a/Emoticon/Matcher/Matcher.php
+++ b/Emoticon/Matcher/Matcher.php
@@ -52,4 +52,5 @@ public function getSmilies()
     {
         return $this->emoticons->getSmilies();
     }
-}
\ No newline at end of file
+}
+
diff --git a/README.md b/README.md
index df55160..730f9d6 100644
--- a/README.md
+++ b/README.md
@@ -1,265 +1,260 @@
-FMBBCodeBundle
-==============
-
-[![Build Status](https://travis-ci.org/helios-ag/FMBbCodeBundle.png?branch=master)](https://travis-ci.org/helios-ag/FMBbCodeBundle)
-
-[![knpbundles.com](http://knpbundles.com/helios-ag/FMBbCodeBundle/badge)](http://knpbundles.com/helios-ag/FMBbCodeBundle)
-
-[![Total Downloads](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/d/total.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle)
-
-[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/version.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle)
-
-[PHP-Decoda](https://github.com/milesj/decoda) integration in Symfony2
-
-A lightweight lexical string parser for BBCode styled markup.
-
-## Installation
-
-To install this bundle, you'll need both the [Decoda library](https://github.com/milesj/decoda)
-and this bundle. Installation depends on how your project is setup:
-
-### Step 1: Installation
-
-Using Composer, just add the following configuration to your `composer.json`:
-
-Or you can use composer to install this bundle:
-Add FMBbcodeBundle in your composer.json:
-
-```json
-{
-    "require": {
-        "helios-ag/fm-bbcode-bundle": "6.2.1"
-    }
-}
-```
-
-Now tell composer to download the bundle by running the command:
-
-``` bash
-$ php composer.phar update helios-ag/fm-bbcode-bundle
-```
-
-### Step 2: Enable the bundle
-
-Finally, enable the bundle in the kernel:
-
-``` php
-<?php
-// app/AppKernel.php
-
-public function registerBundles()
-{
-    $bundles = array(
-        // ...
-        new FM\BbcodeBundle\FMBbcodeBundle(),
-    );
-}
-```
-### Step 3: Dump emoticons (optional)
-
-To enable emoticons via emoticon hook, use the following command to copy emoticons images to
-public folder (web/emoticons)
-
-``` bash
-    ./app/console bbcode:dump
-```
-
-## Basic configuration
-
-### Make the Twig extensions available by updating your configuration:
-
-    By default only "default" filter enabled, which provide support
-    for [b], [i], [u], [s], [sub], [sup], [abbr], [br], [hr], [time]
-    BBCodes
-
-### Examples to use the extension in your Twig template
-
-Define BBCode filter in your config.yml:
-
-``` yaml
-    fm_bbcode:
-      filter_sets:
-        my_default_filter:
-          strict: false # if you want to parse attr values without quotes
-          locale: ru
-          xhtml: true
-          filters: [ default ]
-```
-
-And you can do the following:
-
-``` jinja
-     {{'[b]Bold text[/b]'|bbcode_filter('my_default_filter')}}
-     {{'[u]Underlined text[/u]'|bbcode_filter('my_default_filter')}}
-     {{'[i]Italic text[/i]'|bbcode_filter('my_default_filter')}}
-```
-
-``` yaml
-    fm_bbcode:
-      filter_sets:
-        my_default_filter:
-          locale: ru
-          xhtml: true
-          filters: [ default, quote ]
-          whitelist: [ b, quote ]
-```
-
-After enabling "quote" filter, you can do such things:
-
-``` jinja
-      {{'[quote="helios"]My quote[/quote]'|bbcode_filter('my_default_filter')}}
-```
-
-Also you can define multiple filter sets under filter_sets parameter like this:
-
-``` yaml
-    fm_bbcode:
-      filter_sets:
-        my_forum_filter:
-          locale: ru
-          xhtml: true
-          filters: [ default, quote ]
-          whitelist: [ b, quote ]
-        my_comment_filter:
-          locale: ru
-          xhtml: true
-          filters: [ default, block, code, email, image, list, quote, text, url, video ]
-```
-
-``` jinja
-      {{'[quote="helios"]My quote[/quote]'|bbcode_filter('my_forum_filter')}}
-      {{'[code]My source code[/code]'|bbcode_filter('my_comment_filter')}}
-```
-
-Please keep in mind, that whitelist tags suppress tags, that applied by filters configuration.
-
-
-### Strip filter
-To clear text from any bbcodes use bbcode_clean filter:
-example:
-``` jinja
-{{'[b]some text[/b]'|bbcode_clean}}
-```
-This filter will eliminate any known to decoda tags
-
-### Escaping and line breaks
-
-Escaping and line breaks can be controlled via "escaping" and "line_breaks" parameters under filter configuration.
-Default configuration for them is 'true'. If you wish to pipeline filters, set escaping to false.
-
-## Advanced configuration
-
-### Overriding messages
-
-Some templates and hooks, use text strings, that can be translated into different languages, the original file
-located under decoda/config directory, but content of this file can be overriden with messages option, under
-messages: node. File should be json formatted.
-
-```yaml
-fm_bbcode:
-    config:
-      messages: @SomeBundle/Resources/config/messages.json
-```
-
-### Adding own templates
-
-Your own templates can be defined at templates node, the example below shows how:
-```yaml
-    fm_bbcode:
-        config:
-          templates:
-            - path: @SomeBundle/Resources/views/templates
-```
-Template examples can be found inside decoda library
-
-
-### Adding own filter
-
-To enable a custom filter, add it as a regular service in one of your configuration, and tag it with `fm_bbcode.decoda.filter`:
-
-```yaml
-services:
-  acme_demo.decoda.filter.your_filter_name:
-    class: Fully\Qualified\Filter\Class\Name
-    tags:
-      - { name: fm_bbcode.decoda.filter, id: your_filter_name }
-```
-
-Your service must implement the `Decoda\Filter` interface.
-
-If your service is created by a factory, you **MUST** correctly set the class parameter for this tag to work correctly.
-
-
-### Adding own hook
-
-To enable a custom hook, add it as a regular service in one of your configuration, and tag it with `fm_bbcode.decoda.hook`:
-
-```yaml
-services:
-  acme_demo.decoda.hook.your_hook_name:
-    class: Fully\Qualified\Hook\Class\Name
-    tags:
-      - { name: fm_bbcode.decoda.hook, id: your_hook_name }
-```
-
-Your service must implement the `Decoda\Hook` interface.
-
-If your service is created by a factory, you **MUST** correctly set the class parameter for this tag to work correctly.
-
-
-### Customize your own emoticons
-
-Your own emoticons can be defined at `emoticon` node, the example below shows how:
-
-```yaml
-fm_bbcode:
-  emoticon:
-    resource: path/to/emoticons.yml
-```
-
-```yaml
-# path/to/emoticons.yml
-imports:
-  - { resource: path/to/another/emoticons.yml }
-
-emoticons:
-  my_emoticon:
-    url:   # Default: %fm_bbcode.emoticon.path%/my_emoticon.png
-    html:  # Default: <img src="%fm_bbcode.emoticon.path%/my_emoticon.png" alt="" >
-    xHtml: # Default: <img src="%fm_bbcode.emoticon.path%/my_emoticon.png" alt="" />
-    smilies:
-      - ":my_emoticon:"
-```
-
-### How to automatically dump emoticons on each deploy
-
-Add the following commands to you projects composer.json:
-
-```json
-# composer.json
-    "scripts": {
-        "post-install-cmd": [
-            "FM\\BbcodeBundle\\Composer\\ScriptHandler::installEmoticons"
-        ],
-        "post-update-cmd": [
-            "FM\\BbcodeBundle\\Composer\\ScriptHandler::installEmoticons"
-        ]
-    }
-```
-
-## Contributors
-
-* Gaiffe Antoine [toinouu](https://github.com/toinouu)
-* Luis Íñiguez [idetia](https://github.com/idetia)
-* Sebastian [slider](https://github.com/slider)
-* [olleyyy](https://github.com/olleyyy)
-* Dirk Olbertz [dolbertz](https://github.com/dolbertz)
-* Florian Krauthan [fkrauthan](https://github.com/fkrauthan)
-* [predakanga](https://github.com/predakanga)
-* Dan [piratadelfuturo](https://github.com/piratadelfuturo)
-* Alexandre Quercia [alquerci](https://github.com/alquerci)
-
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/helios-ag/fmbbcodebundle/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
+FMBBCodeBundle
+==============
+
+[![Build Status](https://travis-ci.org/helios-ag/FMBbCodeBundle.png?branch=master)](https://travis-ci.org/helios-ag/FMBbCodeBundle)
+
+[![Total Downloads](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/d/total.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle)
+
+[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/version.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle)
+
+[PHP-Decoda](https://github.com/milesj/decoda) integration in Symfony2
+
+A lightweight lexical string parser for BBCode styled markup.
+
+## Installation
+
+To install this bundle, you'll need both the [Decoda library](https://github.com/milesj/decoda)
+and this bundle. Installation depends on how your project is setup:
+
+### Step 1: Installation
+
+Using Composer, just add the following configuration to your `composer.json`:
+
+Or you can use composer to install this bundle:
+Add FMBbcodeBundle in your composer.json:
+
+```json
+{
+    "require": {
+        "helios-ag/fm-bbcode-bundle": "6.2.1"
+    }
+}
+```
+
+Now tell composer to download the bundle by running the command:
+
+``` bash
+$ php composer.phar update helios-ag/fm-bbcode-bundle
+```
+
+### Step 2: Enable the bundle
+
+Finally, enable the bundle in the kernel:
+
+``` php
+<?php
+// app/AppKernel.php
+
+public function registerBundles()
+{
+    $bundles = array(
+        // ...
+        new FM\BbcodeBundle\FMBbcodeBundle(),
+    );
+}
+```
+### Step 3: Dump emoticons (optional)
+
+To enable emoticons via emoticon hook, use the following command to copy emoticons images to
+public folder (web/emoticons)
+
+``` bash
+    ./app/console bbcode:dump
+```
+
+## Basic configuration
+
+### Make the Twig extensions available by updating your configuration:
+
+    By default only "default" filter enabled, which provide support
+    for [b], [i], [u], [s], [sub], [sup], [abbr], [br], [hr], [time]
+    BBCodes
+
+### Examples to use the extension in your Twig template
+
+Define BBCode filter in your config.yml:
+
+``` yaml
+    fm_bbcode:
+      filter_sets:
+        my_default_filter:
+          strict: false # if you want to parse attr values without quotes
+          locale: ru
+          xhtml: true
+          filters: [ default ]
+```
+
+And you can do the following:
+
+``` jinja
+     {{'[b]Bold text[/b]'|bbcode_filter('my_default_filter')}}
+     {{'[u]Underlined text[/u]'|bbcode_filter('my_default_filter')}}
+     {{'[i]Italic text[/i]'|bbcode_filter('my_default_filter')}}
+```
+
+``` yaml
+    fm_bbcode:
+      filter_sets:
+        my_default_filter:
+          locale: ru
+          xhtml: true
+          filters: [ default, quote ]
+          whitelist: [ b, quote ]
+```
+
+After enabling "quote" filter, you can do such things:
+
+``` jinja
+      {{'[quote="helios"]My quote[/quote]'|bbcode_filter('my_default_filter')}}
+```
+
+Also you can define multiple filter sets under filter_sets parameter like this:
+
+``` yaml
+    fm_bbcode:
+      filter_sets:
+        my_forum_filter:
+          locale: ru
+          xhtml: true
+          filters: [ default, quote ]
+          whitelist: [ b, quote ]
+        my_comment_filter:
+          locale: ru
+          xhtml: true
+          filters: [ default, block, code, email, image, list, quote, text, url, video ]
+```
+
+``` jinja
+      {{'[quote="helios"]My quote[/quote]'|bbcode_filter('my_forum_filter')}}
+      {{'[code]My source code[/code]'|bbcode_filter('my_comment_filter')}}
+```
+
+Please keep in mind, that whitelist tags suppress tags, that applied by filters configuration.
+
+
+### Strip filter
+To clear text from any bbcodes use bbcode_clean filter:
+example:
+``` jinja
+{{'[b]some text[/b]'|bbcode_clean}}
+```
+This filter will eliminate any known to decoda tags
+
+### Escaping and line breaks
+
+Escaping and line breaks can be controlled via "escaping" and "line_breaks" parameters under filter configuration.
+Default configuration for them is 'true'. If you wish to pipeline filters, set escaping to false.
+
+## Advanced configuration
+
+### Overriding messages
+
+Some templates and hooks, use text strings, that can be translated into different languages, the original file
+located under decoda/config directory, but content of this file can be overriden with messages option, under
+messages: node. File should be json formatted.
+
+```yaml
+fm_bbcode:
+    config:
+      messages: @SomeBundle/Resources/config/messages.json
+```
+
+### Adding own templates
+
+Your own templates can be defined at templates node, the example below shows how:
+```yaml
+    fm_bbcode:
+        config:
+          templates:
+            - path: @SomeBundle/Resources/views/templates
+```
+Template examples can be found inside decoda library
+
+
+### Adding own filter
+
+To enable a custom filter, add it as a regular service in one of your configuration, and tag it with `fm_bbcode.decoda.filter`:
+
+```yaml
+services:
+  acme_demo.decoda.filter.your_filter_name:
+    class: Fully\Qualified\Filter\Class\Name
+    tags:
+      - { name: fm_bbcode.decoda.filter, id: your_filter_name }
+```
+
+Your service must implement the `Decoda\Filter` interface.
+
+If your service is created by a factory, you **MUST** correctly set the class parameter for this tag to work correctly.
+
+
+### Adding own hook
+
+To enable a custom hook, add it as a regular service in one of your configuration, and tag it with `fm_bbcode.decoda.hook`:
+
+```yaml
+services:
+  acme_demo.decoda.hook.your_hook_name:
+    class: Fully\Qualified\Hook\Class\Name
+    tags:
+      - { name: fm_bbcode.decoda.hook, id: your_hook_name }
+```
+
+Your service must implement the `Decoda\Hook` interface.
+
+If your service is created by a factory, you **MUST** correctly set the class parameter for this tag to work correctly.
+
+
+### Customize your own emoticons
+
+Your own emoticons can be defined at `emoticon` node, the example below shows how:
+
+```yaml
+fm_bbcode:
+  emoticon:
+    resource: path/to/emoticons.yml
+```
+
+```yaml
+# path/to/emoticons.yml
+imports:
+  - { resource: path/to/another/emoticons.yml }
+
+emoticons:
+  my_emoticon:
+    url:   # Default: %fm_bbcode.emoticon.path%/my_emoticon.png
+    html:  # Default: <img src="%fm_bbcode.emoticon.path%/my_emoticon.png" alt="" >
+    xHtml: # Default: <img src="%fm_bbcode.emoticon.path%/my_emoticon.png" alt="" />
+    smilies:
+      - ":my_emoticon:"
+```
+
+### How to automatically dump emoticons on each deploy
+
+Add the following commands to you projects composer.json:
+
+```json
+# composer.json
+    "scripts": {
+        "post-install-cmd": [
+            "FM\\BbcodeBundle\\Composer\\ScriptHandler::installEmoticons"
+        ],
+        "post-update-cmd": [
+            "FM\\BbcodeBundle\\Composer\\ScriptHandler::installEmoticons"
+        ]
+    }
+```
+
+## Contributors
+
+* Gaiffe Antoine [toinouu](https://github.com/toinouu)
+* Luis Íñiguez [idetia](https://github.com/idetia)
+* Sebastian [slider](https://github.com/slider)
+* [olleyyy](https://github.com/olleyyy)
+* Dirk Olbertz [dolbertz](https://github.com/dolbertz)
+* Florian Krauthan [fkrauthan](https://github.com/fkrauthan)
+* [predakanga](https://github.com/predakanga)
+* Dan [piratadelfuturo](https://github.com/piratadelfuturo)
+* Alexandre Quercia [alquerci](https://github.com/alquerci)
+
+
diff --git a/Templating/BbcodeExtension.php b/Templating/BbcodeExtension.php
index dc03a4e..5717a56 100644
--- a/Templating/BbcodeExtension.php
+++ b/Templating/BbcodeExtension.php
@@ -2,8 +2,6 @@
 
 namespace FM\BbcodeBundle\Templating;
 
-use FM\BbcodeBundle\Translation\Loader\FileLoader;
-
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use FM\BbcodeBundle\Decoda\Decoda as Decoda;
 use FM\BbcodeBundle\Decoda\DecodaManager as DecodaManager;
@@ -88,3 +86,4 @@ public function getName()
         return 'fm_bbcode';
     }
 }
+
diff --git a/composer.json b/composer.json
index 024a17f..f155474 100644
--- a/composer.json
+++ b/composer.json
@@ -1,42 +1,42 @@
-{
-    "name": "helios-ag/fm-bbcode-bundle",
-    "type": "symfony-bundle",
-    "description": "Symfony FMBbCodeBundle",
-    "keywords": ["bbcode"],
-    "homepage": "https://github.com/helios-ag/FMBbCodeBundle",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Albert Ganiev",
-            "email": "helios.ag@gmail.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.2",
-        "mjohnson/decoda": "6.*",
-        "symfony/twig-bundle": "~2.0",
-        "symfony/assetic-bundle": "~2.0",
-        "symfony/config": "~2.0",
-        "symfony/console": "~2.0",
-        "symfony/dependency-injection": "~2.0",
-        "symfony/framework-bundle": "~2.1",
-        "symfony/http-foundation": "~2.1",
-        "symfony/http-kernel": "~2.0",
-        "symfony/process": "~2.0",
-        "symfony/templating": "~2.0",
-        "symfony/yaml": "~2.0",
-        "sensio/distribution-bundle": ">=2.1"
-    },
-    "require-dev": {
-        "symfony/symfony": "~2.1"
-    },
-    "autoload": {
-        "psr-4": { "FM\\BbcodeBundle\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "6.x-dev"
-        }
-    }
-}
+{
+    "name": "helios-ag/fm-bbcode-bundle",
+    "type": "symfony-bundle",
+    "description": "Symfony FMBbCodeBundle",
+    "keywords": ["bbcode"],
+    "homepage": "https://github.com/helios-ag/FMBbCodeBundle",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Albert Ganiev",
+            "email": "helios.ag@gmail.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.2",
+        "mjohnson/decoda": "6.*",
+        "symfony/twig-bundle": "~2.0",
+        "symfony/assetic-bundle": "~2.0",
+        "symfony/config": "~2.0",
+        "symfony/console": "~2.0",
+        "symfony/dependency-injection": "~2.0",
+        "symfony/framework-bundle": "~2.1",
+        "symfony/http-foundation": "~2.1",
+        "symfony/http-kernel": "~2.0",
+        "symfony/process": "~2.0",
+        "symfony/templating": "~2.0",
+        "symfony/yaml": "~2.0",
+        "sensio/distribution-bundle": ">=2.1"
+    },
+    "require-dev": {
+        "symfony/symfony": "~2.1"
+    },
+    "autoload": {
+        "psr-4": { "FM\\BbcodeBundle\\": "" }
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "6.x-dev"
+        }
+    }
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index df20125..67c54cd 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
-
-    <testsuites>
-        <testsuite name="FMBbcodeBundle test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <!-- and this is where your report will be written -->
-        <log type="coverage-clover" target="./clover.xml"/>
-    </logging>
-</phpunit>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
+
+    <testsuites>
+        <testsuite name="FMBbcodeBundle test suite">
+            <directory suffix="Test.php">./Tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory>./</directory>
+            <exclude>
+                <directory>./Resources</directory>
+                <directory>./Tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <!-- and this is where your report will be written -->
+        <log type="coverage-clover" target="./clover.xml"/>
+    </logging>
+</phpunit>
+