Merge branch 'master' of https://github.com/malukenho/PHP-Router into malukenho-master

diff --combined composer.json
index e4e4cc2,bef6463..bef6463
mode 100644,100755..100644
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -1,5 -1,6 +1,6 @@@
  {\r
      "name": "dannyvankooten/php-router",\r
+     "type": "library",\r
      "description": "Simple PHP Router, supports REST and reverse routing.",\r
      "keywords": ["router", "routing", "php", "rest"],\r
      "homepage": "https://github.com/dannyvankooten/PHP-Router",\r
@@@ -16,11 -17,14 +17,14 @@@
          }\r
      ],\r
      "require": {\r
-         "php": ">=5.3.0"\r
+         "php": ">=5.3.3"\r
+     },\r
+     "require-dev": {\r
+         "phpunit/phpunit": "3.7.*"\r
      },\r
      "autoload": {\r
          "psr-0": {\r
-             "PHProuter": "src/"\r
+             "PHPRouter": "src/"\r
          }\r
      }\r
  }