diff --git a/package.json b/package.json
index 0ae429f77..eace135ab 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,12 @@
     }
   },
   "scripts": {
-    "build": "node -r babel-register ./node_modules/.bin/webpack --progress --colors",
+    "build": "yarn build-mermaid && yarn build-mermaid-slim",
+    "build-mermaid": "node -r babel-register ./node_modules/.bin/webpack --progress --colors",
+    "build-mermaid-slim": "node -r babel-register ./node_modules/.bin/webpack --progress --colors --config webpack.config.slim.js",
+    "dist": "yarn dist-mermaid && yarn dist-mermaid-slim",
+    "dist-mermaid": "node -r babel-register ./node_modules/.bin/webpack --progress --colors -p --config webpack.prod.config.js",
+    "dist-mermaid-slim": "node -r babel-register ./node_modules/.bin/webpack --progress --colors -p --config webpack.prod.config.slim.js",
     "upgrade": "rm -rf node_modules && rm yarn.lock && yarn install && ncu -ua && yarn upgrade && yarn remove d3 && yarn add d3@3.5.17",
     "live": "live-server ./test/examples",
     "lint": "node_modules/.bin/standard",
@@ -43,13 +48,7 @@
     "tape": "node node_modules/tape/bin/tape test/cli_test-*.js",
     "jasmine": "yarn run jison && node node_modules/jasmine-es6/bin/jasmine.js",
     "pretest": "yarn run jison && yarn lint",
-    "test": "yarn run tape && yarn run karma",
-    "dist-slim-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js -s mermaid    -o dist/mermaid.slim.js    -x d3   && cat dist/mermaid.slim.js    | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.slim.min.js",
-    "dist-slim-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -s mermaidAPI -o dist/mermaidAPI.slim.js -x d3 && cat dist/mermaidAPI.slim.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.slim.min.js",
-    "dist-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js  -s mermaid    -o dist/mermaid.js         && cat dist/mermaid.js         | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.min.js",
-    "dist-mermaid-nomin": "node node_modules/browserify/bin/cmd.js src/mermaid.js  -s mermaid  -o dist/mermaid.js",
-    "dist-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -s mermaidAPI -o dist/mermaidAPI.js      && cat dist/mermaidAPI.js      | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.min.js",
-    "dist": "yarn run dist-slim-mermaid && yarn run dist-slim-mermaidAPI && yarn run dist-mermaid && yarn run dist-mermaidAPI"
+    "test": "yarn run tape && yarn run karma"
   },
   "repository": {
     "type": "git",
diff --git a/src/mermaid.js b/src/mermaid.js
index cb7640855..f0dd0043e 100644
--- a/src/mermaid.js
+++ b/src/mermaid.js
@@ -4,7 +4,7 @@
  */
 
 var Logger = require('./logger')
-Logger.setLogLevel(1)
+// Logger.setLogLevel(1)
 var log = Logger.Log
 var mermaidAPI = require('./mermaidAPI')
 var nextId = 0
diff --git a/webpack.config.js b/webpack.config.js
index cc5a43c5b..f5f594282 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,8 @@ import path from 'path'
 const config = {
   target: 'web',
   entry: {
-    mermaid: './src/mermaid.js'
+    mermaid: './src/mermaid.js',
+    mermaidAPI: './src/mermaidAPI.js'
   },
   externals: 'fs',
   output: {
diff --git a/webpack.config.slim.js b/webpack.config.slim.js
new file mode 100644
index 000000000..b9d3726b1
--- /dev/null
+++ b/webpack.config.slim.js
@@ -0,0 +1,16 @@
+import path from 'path'
+
+const config = {
+  target: 'web',
+  entry: {
+    mermaid: './src/mermaid.js',
+    mermaidAPI: './src/mermaidAPI.js'
+  },
+  externals: ['fs', 'd3'],
+  output: {
+    path: path.join(__dirname, './dist/'),
+    filename: '[name].slim.js'
+  }
+}
+
+export default [config]
diff --git a/webpack.prod.config.js b/webpack.prod.config.js
new file mode 100644
index 000000000..f204339a4
--- /dev/null
+++ b/webpack.prod.config.js
@@ -0,0 +1,16 @@
+import path from 'path'
+
+const config = {
+  target: 'web',
+  entry: {
+    mermaid: './src/mermaid.js',
+    mermaidAPI: './src/mermaidAPI.js'
+  },
+  externals: 'fs',
+  output: {
+    path: path.join(__dirname, './dist/'),
+    filename: '[name].min.js'
+  }
+}
+
+export default [config]
diff --git a/webpack.prod.config.slim.js b/webpack.prod.config.slim.js
new file mode 100644
index 000000000..6093a7d58
--- /dev/null
+++ b/webpack.prod.config.slim.js
@@ -0,0 +1,16 @@
+import path from 'path'
+
+const config = {
+  target: 'web',
+  entry: {
+    mermaid: './src/mermaid.js',
+    mermaidAPI: './src/mermaidAPI.js'
+  },
+  externals: ['fs', 'd3'],
+  output: {
+    path: path.join(__dirname, './dist/'),
+    filename: '[name].slim.min.js'
+  }
+}
+
+export default [config]