Merge branch 'master' into eugene-matvejev-patch-2

Author: eugene-matvejev

package.json

@@ -16,8 +16,8 @@
     "license": "MIT",
     "dependencies": {
         "deepmerge": "^1.3.1",
-        "node-object-field-resolver": "^0.1",
-        "jsonfile": "^2.4.0"
+        "jsonfile": "^2.4.0",
+        "node-object-field-resolver": "^1.0"
     },
     "devDependencies": {
         "jest": "^18.1.0"