diff --git a/.travis.yml b/.travis.yml
index 00d5121e..dcc88843 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,18 @@
 language: php
 
 php:
-  - 5.3
-  # - 5.4
+    - 5.3
+    - 5.5
 
 env:
-  - SYMFONY_VERSION=origin/master
+    - SYMFONY_VERSION=origin/master
 
 before_script:
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install
+    - curl -s http://getcomposer.org/installer | php
+    - php composer.phar install
 
 script: phpunit
 
 notifications:
     email:
-        - abhoryo@free.fr
\ No newline at end of file
+        - abhoryo@free.fr
diff --git a/Grid/Action/DeleteMassAction.php b/Grid/Action/DeleteMassAction.php
index 0af51036..fe4d393b 100644
--- a/Grid/Action/DeleteMassAction.php
+++ b/Grid/Action/DeleteMassAction.php
@@ -18,7 +18,6 @@ class DeleteMassAction extends MassAction
      * Default DeleteMassAction constructor
      *
      * @param boolean $confirm Show confirm message if true
-     * @return \APY\DataGridBundle\Grid\Action\MassAction
      */
     public function __construct($confirm = false)
     {
diff --git a/Grid/Action/MassAction.php b/Grid/Action/MassAction.php
index 4d9615dd..0122cab4 100644
--- a/Grid/Action/MassAction.php
+++ b/Grid/Action/MassAction.php
@@ -26,10 +26,8 @@ class MassAction implements MassActionInterface
      * @param string $title Title of the mass action
      * @param string $callback Callback of the mass action
      * @param boolean $confirm Show confirm message if true
-     * @param array $parameters Additionnal parameters
+     * @param array $parameters Additional parameters
      * @param string $role Security role
-     *
-     * @return \APY\DataGridBundle\Grid\Action\MassAction
      */
     public function __construct($title, $callback = null, $confirm = false, $parameters = array(), $role = null)
     {
@@ -141,6 +139,7 @@ public function getConfirmMessage()
      * Set action/controller parameters
      *
      * @param array $parameters
+     * @return $this
      */
     public function setParameters(array $parameters)
     {
diff --git a/Grid/Action/RowAction.php b/Grid/Action/RowAction.php
index f0d2f5bf..6f40082d 100644
--- a/Grid/Action/RowAction.php
+++ b/Grid/Action/RowAction.php
@@ -196,7 +196,7 @@ public function getColumn()
     /**
      * Add route parameter
      *
-     * @param array|string $routeParameter
+     * @param array|string $routeParameters
      *
      * @return self
      */
diff --git a/Grid/Column/Column.php b/Grid/Column/Column.php
index 06173b98..df97a0d4 100755
--- a/Grid/Column/Column.php
+++ b/Grid/Column/Column.php
@@ -258,6 +258,7 @@ public function getTitle()
      * Set column visibility
      *
      * @param boolean $visible
+     * @return $this
      */
     public function setVisible($visible)
     {
@@ -460,7 +461,7 @@ public function isQueryValid($query)
 
     /**
      * Set column visibility for source class
-     * @param $value
+     * @param $visibleForSource
      * @return \APY\DataGridBundle\Grid\Column\Column
      */
     public function setVisibleForSource($visibleForSource)
@@ -483,6 +484,7 @@ public function isVisibleForSource()
      * Set column as primary
      *
      * @param boolean $primary
+     * @return $this
      */
     public function setPrimary($primary)
     {
@@ -503,6 +505,7 @@ public function isPrimary()
     /**
      * Set column align
      * @param string $align left/right/center
+     * @return $this
      */
     public function setAlign($align)
     {
@@ -767,6 +770,7 @@ public function hasDQLFunction(&$matches = null)
      * Internal function
      *
      * @param $securityContext
+     * @return $this
      */
     public function setSecurityContext(SecurityContextInterface $securityContext)
     {
@@ -894,5 +898,4 @@ public function getIsAggregate()
     {
         return $this->isAggregate;
     }
-
 }
diff --git a/Grid/Export/CSVExport.php b/Grid/Export/CSVExport.php
index 83ecc73d..b9938c27 100644
--- a/Grid/Export/CSVExport.php
+++ b/Grid/Export/CSVExport.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * Comma-Separated Values
- *
  */
 class CSVExport extends DSVExport
 {
diff --git a/Grid/Export/ExcelExport.php b/Grid/Export/ExcelExport.php
index add18403..916dde18 100644
--- a/Grid/Export/ExcelExport.php
+++ b/Grid/Export/ExcelExport.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * Excel (This export produces a warning with new Office Excel)
- *
  */
 class ExcelExport extends Export
 {
diff --git a/Grid/Export/JSONExport.php b/Grid/Export/JSONExport.php
index 488acf2c..8397831d 100644
--- a/Grid/Export/JSONExport.php
+++ b/Grid/Export/JSONExport.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * JSON
- *
  */
 class JSONExport extends Export
 {
diff --git a/Grid/Export/PHPExcel2003Export.php b/Grid/Export/PHPExcel2003Export.php
index 8d6346e6..234737dc 100644
--- a/Grid/Export/PHPExcel2003Export.php
+++ b/Grid/Export/PHPExcel2003Export.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * PHPExcel_Excel 2003 Export (.xlsx)
- *
  */
 class PHPExcel2003Export extends PHPExcel2007Export
 {
diff --git a/Grid/Export/PHPExcel2007Export.php b/Grid/Export/PHPExcel2007Export.php
index d6043f23..dafcd9d0 100644
--- a/Grid/Export/PHPExcel2007Export.php
+++ b/Grid/Export/PHPExcel2007Export.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * PHPExcel 2007 Export
- *
  */
 class PHPExcel2007Export extends PHPExcel5Export
 {
diff --git a/Grid/Export/PHPExcel5Export.php b/Grid/Export/PHPExcel5Export.php
index e55359c5..5ab9f18b 100644
--- a/Grid/Export/PHPExcel5Export.php
+++ b/Grid/Export/PHPExcel5Export.php
@@ -13,10 +13,8 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * PHPExcel 5 Export (97-2003) (.xls)
  * 52 columns maximum
- *
  */
 class PHPExcel5Export extends Export
 {
diff --git a/Grid/Export/PHPExcelHTMLExport.php b/Grid/Export/PHPExcelHTMLExport.php
index c1eb0412..09b6138b 100644
--- a/Grid/Export/PHPExcelHTMLExport.php
+++ b/Grid/Export/PHPExcelHTMLExport.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * PHPExcel HTML Export
- *
  */
 class PHPExcelHTMLExport extends PHPExcel5Export
 {
diff --git a/Grid/Export/PHPExcelPDFExport.php b/Grid/Export/PHPExcelPDFExport.php
index 0103d4c1..3d5e964e 100644
--- a/Grid/Export/PHPExcelPDFExport.php
+++ b/Grid/Export/PHPExcelPDFExport.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * PHPExcel PDF Export
- *
  */
 class PHPExcelPDFExport extends PHPExcel5Export
 {
diff --git a/Grid/Export/SCSVExport.php b/Grid/Export/SCSVExport.php
index 5e71fe6a..ab6c03a3 100644
--- a/Grid/Export/SCSVExport.php
+++ b/Grid/Export/SCSVExport.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * Semi-Colon-Separated Values
- *
  */
 class SCSVExport extends CSVExport
 {
diff --git a/Grid/Export/TSVExport.php b/Grid/Export/TSVExport.php
index a353de5a..e41d89d2 100644
--- a/Grid/Export/TSVExport.php
+++ b/Grid/Export/TSVExport.php
@@ -13,9 +13,7 @@
 namespace APY\DataGridBundle\Grid\Export;
 
 /**
- *
  * Tab-Separated Values
- *
  */
 class TSVExport extends DSVExport
 {
diff --git a/Grid/Export/XMLExport.php b/Grid/Export/XMLExport.php
index 9433785b..2710f83c 100644
--- a/Grid/Export/XMLExport.php
+++ b/Grid/Export/XMLExport.php
@@ -17,9 +17,7 @@
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 
 /**
- *
  * XML
- *
  */
 class XMLExport extends Export
 {
diff --git a/Grid/Filter.php b/Grid/Filter.php
index ebb4d219..d3626f4e 100644
--- a/Grid/Filter.php
+++ b/Grid/Filter.php
@@ -9,6 +9,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 namespace APY\DataGridBundle\Grid;
 
 class Filter
diff --git a/Resources/config/columns.xml b/Resources/config/columns.xml
index 07fac6f6..e89d8ac5 100644
--- a/Resources/config/columns.xml
+++ b/Resources/config/columns.xml
@@ -52,6 +52,5 @@
         <service id="grid.column.rank" class="%grid.column.rank.class%" public="false">
             <tag name="grid.column.extension" />
         </service>
-
     </services>
 </container>
\ No newline at end of file
diff --git a/Tests/AddColumnTest.php b/Tests/AddColumnTest.php
index a6cd8d7f..1910629e 100644
--- a/Tests/AddColumnTest.php
+++ b/Tests/AddColumnTest.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace APY\DataGridBundle\Tests;
 
 use APY\DataGridBundle\Grid\Columns;
diff --git a/Tests/Test.php b/Tests/Test.php
index ec07ff30..893afcee 100644
--- a/Tests/Test.php
+++ b/Tests/Test.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace APY\DataGridBundle\Tests;
 
 class Test extends \PHPUnit_Framework_TestCase
diff --git a/Twig/DataGridExtension.php b/Twig/DataGridExtension.php
index f2bb9a4a..e3bb7290 100644
--- a/Twig/DataGridExtension.php
+++ b/Twig/DataGridExtension.php
@@ -252,6 +252,7 @@ public function getGridFilter($column, $grid, $submitOnChange = true)
 
         return '';
     }
+
     /**
      * Column Operator Drawing override
      *
diff --git a/composer.json b/composer.json
index 012dc2f0..680025a8 100644
--- a/composer.json
+++ b/composer.json
@@ -30,10 +30,8 @@
         "PHPExcel": "Export the grid (Excel, HTML or PDF)"
     },
     "autoload": {
-        "psr-0": { "APY\\DataGridBundle": "" }
+        "psr-4": { "APY\\DataGridBundle\\": "" }
     },
-    "target-dir": "APY/DataGridBundle",
-    "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
             "dev-master": "2.1-dev"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 79b7a60a..c3c62ba8 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit bootstrap="./Tests/bootstrap.php">
-
-    <!-- Les fichiers de tests à lancer -->
     <testsuites>
         <testsuite name="APYDataGridBundle test suite">
             <directory suffix="Test.php">./Tests</directory>
         </testsuite>
     </testsuites>
-
-    <!-- Quels fichiers sont concernés par l'évaluation du code coverage -->
     <filter>
         <whitelist>
             <directory>./</directory>