diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..27b5c0d
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015", "react", "stage-2"]
+}
diff --git a/package.json b/package.json
index 0831abc..89a0e41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "react-scrollbar",
-  "version": "0.3.0",
+  "name": "react-scrollbar-versioned",
+  "version": "15.1.0",
   "description": "ScrollArea component for react",
   "main": "./dist/scrollArea.js",
   "scripts": {
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/souhe/reactScrollbar.git"
+    "url": "git@github.com:ekut/reactScrollbar.git"
   },
   "keywords": [
     "react",
@@ -22,28 +22,31 @@
   "license": "MIT",
   "dependencies": {
     "line-height": "^0.1.1",
-    "react": "^0.14.6",
-    "react-motion": "^0.3.1"
+    "react": "^15.1.0",
+    "react-motion": "^0.4.3"
   },
   "devDependencies": {
-    "babel": "^5.8.23",
-    "babel-core": "^5.8.25",
-    "babel-loader": "^5.3.2",
-    "babel-runtime": "^5.8.24",
+    "babel": "^6.5.2",
+    "babel-core": "^6.9.0",
+    "babel-loader": "^6.2.4",
+    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-react": "^6.5.0",
+    "babel-preset-stage-2": "^6.5.0",
+    "babel-runtime": "^6.9.0",
     "chai": "^3.5.0",
     "css-loader": "^0.23.1",
     "expect": "^1.13.4",
-    "expect-jsx": "^2.2.2",
+    "expect-jsx": "^2.5.1",
     "gulp": "^3.9.0",
     "gulp-babel": "^6.1.2",
     "gulp-concat": "^2.5.2",
-    "gulp-connect": "^2.2.0",
+    "gulp-connect": "^4.0.0",
     "gulp-less": "^3.0.2",
     "karma": "^0.13.19",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-cli": "^0.1.2",
-    "karma-mocha": "^0.2.1",
-    "karma-mocha-reporter": "^1.1.5",
+    "karma-chrome-launcher": "^1.0.1",
+    "karma-cli": "^1.0.0",
+    "karma-mocha": "^1.0.1",
+    "karma-mocha-reporter": "^2.0.3",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
@@ -53,8 +56,8 @@
     "mocha": "^2.4.4",
     "object-assign": "^4.0.1",
     "phantomjs-prebuilt": "^2.1.3",
-    "react-addons-test-utils": "^0.14.6",
-    "react-dom": "^0.14.0",
+    "react-addons-test-utils": "^15.1.0",
+    "react-dom": "^15.1.0",
     "run-sequence": "^1.1.4",
     "style-loader": "^0.13.0",
     "webpack": "^1.12.2",
diff --git a/webpack.base.config.js b/webpack.base.config.js
index 644913b..ae2014f 100644
--- a/webpack.base.config.js
+++ b/webpack.base.config.js
@@ -27,10 +27,7 @@ module.exports = {
     module: {
         loaders: [
             { 
-                test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel', query: {
-                    optional: ['runtime'],
-                    stage: 0
-                }
+                test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel'
             },
             { 
                 test: /\.less$/,