diff --git a/composer.json b/composer.json
index 9b1ff0a..6395d42 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
         "monolog/monolog": "1.0.*"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "master"
+        "fabpot/php-cs-fixer": "master",
+	"sami/sami": "dev-master"
     },
     "autoload": {
         "psr-0": {
diff --git a/composer.lock b/composer.lock
index 6b9eddc..f6d6fd7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,5 +1,5 @@
 {
-    "hash": "df8dea92fddcc47c4b68e4ab869c10ac",
+    "hash": "4a4d0e3d6db03e8b6b4b5cc8789e466f",
     "packages": [
         {
             "package": "monolog/monolog",
@@ -8,40 +8,45 @@
         {
             "package": "symfony/process",
             "version": "dev-master",
-            "source-reference": "106f2db51cecf2fe5ee59e428b8f4a918c4034fa",
             "alias-pretty-version": "2.1.x-dev",
             "alias-version": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/process",
             "version": "dev-master",
-            "source-reference": "106f2db51cecf2fe5ee59e428b8f4a918c4034fa"
+            "source-reference": "fc536cce9e41251135595a8fa21635800199b51b"
         }
     ],
     "packages-dev": [
         {
             "package": "fabpot/php-cs-fixer",
             "version": "dev-master",
-            "source-reference": "33ee181472e603a0eccdb245248745dc1abfface"
+            "source-reference": "fe35a4a1043d525a52d25e4191551bb9198181a4"
+        },
+        {
+            "package": "nikic/php-parser",
+            "version": "dev-master",
+            "source-reference": "3f66b7ecacfd5e88a40341fd44694276e413ec64"
+        },
+        {
+            "package": "pimple/pimple",
+            "version": "1.0.0"
+        },
+        {
+            "package": "sami/sami",
+            "version": "dev-master",
+            "source-reference": "9d47d4314c63f481d8fdc456e17f8596c1253142"
         },
         {
             "package": "symfony/console",
             "version": "dev-master",
-            "source-reference": "1edd7b739561e87bde81ff1c2ce08bd89e92277e",
             "alias-pretty-version": "2.1.x-dev",
             "alias-version": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/console",
             "version": "dev-master",
-            "source-reference": "1edd7b739561e87bde81ff1c2ce08bd89e92277e"
-        },
-        {
-            "package": "symfony/filesystem",
-            "version": "dev-master",
-            "source-reference": "e1f7c293c029502921d77f914275b411f80ccbca",
-            "alias-pretty-version": "2.1.x-dev",
-            "alias-version": "2.1.9999999.9999999-dev"
+            "source-reference": "22be75777fe18315637abe092de5aa5c7f4ed3cd"
         },
         {
             "package": "symfony/filesystem",
@@ -49,23 +54,50 @@
             "source-reference": "e1f7c293c029502921d77f914275b411f80ccbca"
         },
         {
-            "package": "symfony/finder",
+            "package": "symfony/filesystem",
             "version": "dev-master",
-            "source-reference": "a2cef64d5072b284b671ee8e06b8ebc38c2969e1",
             "alias-pretty-version": "2.1.x-dev",
             "alias-version": "2.1.9999999.9999999-dev"
         },
         {
             "package": "symfony/finder",
             "version": "dev-master",
-            "source-reference": "a2cef64d5072b284b671ee8e06b8ebc38c2969e1"
+            "source-reference": "9ee9a907afeef52956187e862714a7702ca26590"
+        },
+        {
+            "package": "symfony/finder",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "symfony/yaml",
+            "version": "dev-master",
+            "source-reference": "49ad500448c17a4b515c8f567dbb540af3cf41ef"
+        },
+        {
+            "package": "symfony/yaml",
+            "version": "dev-master",
+            "alias-pretty-version": "2.1.x-dev",
+            "alias-version": "2.1.9999999.9999999-dev"
+        },
+        {
+            "package": "twig/twig",
+            "version": "dev-master",
+            "source-reference": "78a935b6ffbcbd8f4e740df895f87a93347b551c"
+        },
+        {
+            "package": "twig/twig",
+            "version": "dev-master",
+            "alias-pretty-version": "1.8.x-dev",
+            "alias-version": "1.8.9999999.9999999-dev"
         }
     ],
     "aliases": [
 
     ],
     "minimum-stability": "dev",
-    "stability-flags": [
-
-    ]
+    "stability-flags": {
+        "sami/sami": 20
+    }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 58546bb..4e55c40 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -9,7 +9,7 @@
          stopOnFailure="false"
          syntaxCheck="true"
          verbose="false"
-         bootstrap="bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <logging>
       <log type="coverage-html" target="tests/phpunit_report/report" charset="UTF-8"