Merge branch 'release/1.1.3'

.travis.yml

@@ -1,3 +1,5 @@
 language: node_js
 node_js:
-  - 0.10
+  - "0.10"
+  - "0.12"
+  - iojs

README.md

@@ -3,11 +3,11 @@
 
 ##Description
 
-Whole architecture of [Catberry Framework](https://github.com/catberry/catberry)
+Entire architecture of [Catberry Framework](https://github.com/catberry/catberry)
 is based on [Service Locator pattern](http://en.wikipedia.org/wiki/Service_locator_pattern) 
 and [Dependency Injection](http://en.wikipedia.org/wiki/Dependency_injection).
-It means there is only one service locator in one Catberry application and all 
-modules are resolved from this Locator when you use `getMiddleware` method in 
+It means there is only one service locator in a Catberry application and all
+modules are resolved from this locator when you use `getMiddleware` method in
 `server.js` or `startWhenReady` in `browser.js`.
 Before that moment feel free to register your own modules-services to inject 
 them into Catberry modules via DI.
@@ -126,12 +126,12 @@ http
 
 ##Contribution
 If you have found a bug, please create pull request with [mocha](https://www.npmjs.org/package/mocha) 
-unit-test which reproduces it or describe all details in issue if you can not 
-implement test. If you want to propose some improvements just create issue or 
-pull request but please do not forget to use `npm test` to be sure that your 
+unit-test which reproduces it or describe all details in an issue if you can not
+implement test. If you want to propose some improvements just create an issue or
+a pull request but please do not forget to use `npm test` to be sure that your
 code is awesome.
 
-All changes should satisfy this [Code Style Guide](https://github.com/catberry/catberry/blob/master/docs/code-style-guide.md).
+All changes should satisfy this [Code Style Guide](https://github.com/catberry/catberry/blob/4.0.0/docs/code-style-guide.md).
 
 Also your changes should be covered by unit tests using [mocha](https://www.npmjs.org/package/mocha).
 

package.json

@@ -1,12 +1,17 @@
 {
 	"name": "catberry-locator",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"author": "Denis Rechkunov <[email protected]>",
 	"description": "Service Locator component for Catberry Framework",
 	"homepage": "https://github.com/catberry/catberry-locator",
 	"keywords": [
-		"catberry", "service locator", "locator", "module",
-		"dependency injection", "IoC", "DI"
+		"catberry",
+		"service locator",
+		"locator",
+		"module",
+		"dependency injection",
+		"IoC",
+		"DI"
 	],
 	"bugs": {
 		"url": "https://github.com/catberry/catberry-locator/issues",
@@ -17,23 +22,19 @@
 		"url": "git://github.com/catberry/catberry-locator.git"
 	},
 	"main": "./lib/ServiceLocator.js",
-
 	"devDependencies": {
-		"istanbul-harmony": "~0.3.0",
-		"coveralls": "^2.11.1",
-		"mocha": "^2.0.0",
-		"jscs": "^1.6.0",
-		"jshint": "^2.5.0"
+		"istanbul-harmony": "~0.3.1",
+		"coveralls": "^2.11.2",
+		"mocha": "^2.1.0",
+		"jscs": "~1.6.2",
+		"jshint": "^2.6.0"
 	},
-
 	"engines": {
-		"node": "~0.10.26"
+		"node": ">=0.10"
 	},
-
 	"scripts": {
 		"test": "make"
 	},
-
 	"licenses": [
 		{
 			"type": "MIT",