diff --git a/config/webpack.config.js b/config/webpack.config.js
index b049550..fc830ac 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -24,6 +24,7 @@ module.exports = extend(common, {
     module: {
         loaders: common.loaders.concat([{
             test: /\.jsx?$/,
+            exclude: /node_modules/,
             loaders: ['react-hot', 'jsx-loader?harmony'],
         }])
     }
diff --git a/demos/index.js b/demos/index.js
index 134ea7f..e4d0ef7 100644
--- a/demos/index.js
+++ b/demos/index.js
@@ -9,7 +9,8 @@ require('./demo.css');
 
 
 var React = require('react'),
-    App = require('./app');
+    App = require('./app'),
+    ReactDOM = require('react-dom');
 
 
-React.render(<App />, document.body);
+ReactDOM.render(<App />, document.body);
diff --git a/package.json b/package.json
index 573ffaa..1ed1501 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,6 @@
     "email": "ismaelga@gmail.com"
   },
   "main": "dist/react-json-editor.js",
-  "peerDependencies": {
-    "react": ">=0.12.2 <1.0.0"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/ismaelga/react-json-editor.git"
@@ -48,10 +45,10 @@
     "jsx-loader": "^0.12.2",
     "marked": "^0.3.3",
     "purecss": "^0.5.0",
-    "react": "^0.14.6",
-    "react-addons-test-utils": "^0.14.6",
-    "react-addons-update": "^0.14.6",
-    "react-dom": "^0.14.6",
+    "react": "^15.0.2",
+    "react-addons-test-utils": "^15.0.2",
+    "react-addons-update": "^15.0.2",
+    "react-dom": "^15.0.2",
     "react-ghfork": "^0.3.0",
     "react-hot-loader": "^1.1.6",
     "style-loader": "^0.8.3",