diff --git a/build/.locale.js b/build/.locale.js
index 2a9c3025546d81907383dde95f5490deec8ccefa..4e531868284e41fe7646eb7ac6acf9ec24fb2155 100644
--- a/build/.locale.js
+++ b/build/.locale.js
@@ -1,4 +1,4 @@
-module.exports = require('../lib/')
+module.exports = require('../lib')
   .extend('faker', function() {
     try {
       return require('faker/locale/<%= lang %>');
diff --git a/build/dist.js b/build/dist.js
index c7014e96f2ccc873ec7b0222d24a48dc0941d719..133e9c5a0be77bf2a3c0b0aa6a04117a46727e8b 100644
--- a/build/dist.js
+++ b/build/dist.js
@@ -37,6 +37,9 @@ function bundle(options) {
           }
 
           switch (importee) {
+            case 'faker':
+              return require.resolve('faker/locale/en_US');
+
             case 'json-schema-ref-parser':
               return importee;
           }
@@ -97,6 +100,11 @@ Promise.resolve()
   return bundle({ id: pkg.name, src: path.join(projectDir, 'index.js') });
 })
 .then(() => {
+  if (process.argv.slice(2).indexOf('--all') === -1) {
+    console.log('Skipping languages...');
+    return;
+  }
+
   // proxied versions from faker's locales
   var languages = glob.sync(path.join(require.resolve('faker'), '../locale/*.js'));
 
diff --git a/index.js b/index.js
index 04b5ff84e3c2e0561804f2af098eea4bb82b76ee..1cb9ee739609496e7f95b48df22b9f6436b16443 100644
--- a/index.js
+++ b/index.js
@@ -8,7 +8,7 @@ module.exports = require('./lib')
   })
   .extend('faker', function() {
     try {
-      return require('faker/lib');
+      return require('faker');
     } catch (e) {
       return null;
     }
diff --git a/package-lock.json b/package-lock.json
index 04a14e585ff95b3abcf041d4f2ebcc485dcd28ce..2500f42fca9419b04a2560ae13afce8840386f8c 100644
Binary files a/package-lock.json and b/package-lock.json differ
diff --git a/package.json b/package.json
index b382e0e7c75cf3d52192191c315ab5d25b9a2a21..c02b7875ed2031a71d91f858809ab01c03ab5d1d 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "dev": "jasmine-node spec/schema --coffee --verbose --autoTest --watchFolders lib",
     "cover": "istanbul cover --root lib --x '**/spec/**' -- jasmine-node --coffee spec",
     "cover:up": "codecov --file=coverage/lcov.info --disable=gcov -e TRAVIS_NODE_VERSION",
-    "dist": "npm run build && npm run build:dist",
+    "dist": "npm run build:dist",
     "build": "tarima -qf VERSION=`./build/VERSION`",
     "build:dist": "npm run build && node build/dist.js",
     "typedoc": "typedoc --out docs/html ts/ --module commonjs",
@@ -69,21 +69,21 @@
     "eslint": "^4.14.0",
     "fs-extra": "^5.0.0",
     "glob": "^7.1.1",
-    "google-closure-compiler-js": "^20171203.0.0",
+    "google-closure-compiler-js": "^20180204.0.0",
     "istanbul": "^0.4.5",
     "jasmine-node": "2.0.0-beta4",
     "jayschema": "^0.3.1",
     "lodash.template": "^4.4.0",
-    "rollup": "^0.53.0",
+    "rollup": "^0.56.2",
     "rollup-plugin-commonjs": "^8.2.1",
     "rollup-plugin-node-resolve": "^3.0.0",
     "seedrandom": "^2.4.3",
     "semver": "^5.3.0",
     "tarima": "^4.0.1",
-    "ts-node": "^4.1.0",
+    "ts-node": "^5.0.0",
     "tslint": "^5.8.0",
     "tv4": "^1.2.7",
-    "typedoc": "^0.9.0",
+    "typedoc": "^0.10.0",
     "typescript": "^2.1.1",
     "uglify-js": "^3.3.2",
     "z-schema": "^3.18.1"