Merge branch '1.0' into 1.1

Author: johnkary

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.6",
-        "phpunit/phpunit": ">=4.7"
+        "phpunit/phpunit": ">=4.7,<6.0"
     },
     "autoload": {
         "psr-0": {