diff --git a/.gitignore b/.gitignore
index f474a5d..c85f162 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 /vendor/
 /docs/build
 composer.phar
+composer.lock
 phpunit.xml
-
diff --git a/composer.json b/composer.json
index 21ff774..8fa6a0e 100644
--- a/composer.json
+++ b/composer.json
@@ -5,31 +5,36 @@
     "keywords": ["video processing", "video", "audio processing", "audio", "avconv", "ffmpeg", "avprobe", "ffprobe"],
     "license": "MIT",
     "authors": [
-    {
-        "name": "Romain Neutron",
-        "email": "imprec@gmail.com",
-        "homepage": "http://www.lickmychip.com/"
-    },
-    {
-        "name": "Phraseanet Team",
-        "email": "info@alchemy.fr",
-        "homepage": "http://www.phraseanet.com/"
-    }
+        {
+            "name": "Romain Neutron",
+            "email": "imprec@gmail.com",
+            "homepage": "http://www.lickmychip.com/"
+        },
+        {
+            "name": "Phraseanet Team",
+            "email": "info@alchemy.fr",
+            "homepage": "http://www.phraseanet.com/"
+        },
+        {
+            "name": "Patrik Karisch",
+            "email": "patrik@karisch.guru",
+            "homepage": "http://www.karisch.guru"
+        }
     ],
     "require": {
-        "php"                          : ">=5.3.3",
-        "alchemy/binary-driver"        : "~1.5",
-        "doctrine/cache"               : "~1.0",
-        "evenement/evenement"          : "^2.0|^1.0",
-        "neutron/temporary-filesystem" : "~2.1, >=2.1.1"
+        "php": ">=5.3.3",
+        "alchemy/binary-driver": "^1.5",
+        "doctrine/cache": "^1.0",
+        "evenement/evenement": "^2.0 || ^1.0",
+        "neutron/temporary-filesystem": "^2.1.1"
     },
     "suggest": {
-        "php-ffmpeg/extras"        : "A compilation of common audio & video drivers for PHP-FFMpeg"
+        "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
     },
     "require-dev": {
-        "sami/sami"       : "~1.0",
-        "silex/silex"     : "~1.0",
-        "phpunit/phpunit" : "~3.7"
+        "sami/sami": "~1.0",
+        "silex/silex": "~1.0",
+        "phpunit/phpunit": "~3.7"
     },
     "autoload": {
         "psr-0": {
@@ -38,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.5-dev"
+            "dev-master": "0.6-dev"
         }
     }
 }