diff --git a/package.json b/package.json
index 40ef3d434..e8868f571 100644
--- a/package.json
+++ b/package.json
@@ -34,9 +34,10 @@
     "babel-core": "^6.18.2",
     "babel-loader": "^6.2.8",
     "babel-plugin-react-require": "^3.0.0",
+    "babel-polyfill": "^6.20.0",
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-react": "^6.16.0",
-    "babel-polyfill": "^6.20.0",
+    "babel-preset-stage-2": "^6.18.0",
     "eslint": "^3.10.2",
     "eslint-config-airbnb": "^13.0.0",
     "eslint-loader": "^1.6.1",
diff --git a/webpack.config.js b/webpack.config.js
index 34b4bdffc..d13ac540c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -25,12 +25,12 @@ module.exports = {
     loaders: [
       { test: /\.css$/, loader: "style!css" },
       {
-	test: /\.jsx?$/,
-	// Enable caching for improved performance during development
-	// It uses default OS directory by default. If you need
-	// something more custom, pass a path to it.
-	// I.e., babel?cacheDirectory=<path>
-	loader: 'babel?cacheDirectory'
+	    test: /\.jsx?$/,
+	    loader: 'babel',
+        query: {
+          cacheDirectory: true,
+          presets:[ 'es2015', 'react', 'stage-3' ]
+        }
       }
     ]
   }