Merge remote-tracking branch 'github/pr/174'

composer.json

@@ -27,5 +27,10 @@
     },
     "autoload": {
         "psr-0": {"Predis": "lib/"}
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0-dev"
+        }
     }
 }