diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..8591b66
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,5 @@
+{
+    "presets": [
+        "es2015"
+    ]
+}
diff --git a/.eslintignore b/.eslintignore
index 24ba984..4add417 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,3 @@
 spec/spec.js
 *.md
+webpack.config.spec.js
diff --git a/README.md b/README.md
index 0809c85..4f2a36b 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@
 
 `npm install react-json-schema`
 
-This library builds React elements from JSON by mapping JSON definitions to React components that you expose. The interest behind making this library is to allow non-programmers to construct a view using JSON, which can be stored and retrieved in a database. Use it as you'd like.
+This library constructs React elements from JSON by mapping JSON definitions to React components that you expose.
 
 JSX is not a dependency for react-json-schema.
 
-For a quick reference, you can jump to [full example](#putting-it-all-together).
+For a quick reference, you can jump to the [full example](#putting-it-all-together).
 
 For 0.3.0+, you must use React 0.14.0+. You may use 0.2.0 for older versions.
 
diff --git a/dist/react-json-schema.js b/dist/react-json-schema.js
index e9e3fa0..eaccae0 100644
--- a/dist/react-json-schema.js
+++ b/dist/react-json-schema.js
@@ -1,26 +1,26 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', {
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
-
 var _react = require('react');
 
-var _node_modulesReactLibReactDOMFactories = require('../node_modules/react/lib/ReactDOMFactories');
+var _ReactDOMFactories = require('react/lib/ReactDOMFactories');
 
-var _node_modulesReactLibReactDOMFactories2 = _interopRequireDefault(_node_modulesReactLibReactDOMFactories);
+var _ReactDOMFactories2 = _interopRequireDefault(_ReactDOMFactories);
 
 var _lodash = require('lodash');
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
 var _componentMap = null;
 
-var ReactJsonSchema = (function () {
+var ReactJsonSchema = function () {
   function ReactJsonSchema() {
     _classCallCheck(this, ReactJsonSchema);
   }
@@ -67,7 +67,7 @@ var ReactJsonSchema = (function () {
           Component = schema.component;
         } else if (_componentMap && _componentMap[schema.component]) {
           Component = _componentMap[schema.component];
-        } else if ((0, _lodash.has)(_node_modulesReactLibReactDOMFactories2['default'], schema.component)) {
+        } else if ((0, _lodash.has)(_ReactDOMFactories2.default, schema.component)) {
           Component = schema.component;
         }
       } else {
@@ -93,7 +93,6 @@ var ReactJsonSchema = (function () {
   }]);
 
   return ReactJsonSchema;
-})();
+}();
 
-exports['default'] = ReactJsonSchema;
-module.exports = exports['default'];
+exports.default = ReactJsonSchema;
diff --git a/dist/react-json-schema.min.js b/dist/react-json-schema.min.js
index a12536e..1d579ce 100644
--- a/dist/react-json-schema.min.js
+++ b/dist/react-json-schema.min.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor}}();function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{"default":obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function")}}var _react=require("react");var _node_modulesReactLibReactDOMFactories=require("../node_modules/react/lib/ReactDOMFactories");var _node_modulesReactLibReactDOMFactories2=_interopRequireDefault(_node_modulesReactLibReactDOMFactories);var _lodash=require("lodash");var _componentMap=null;var ReactJsonSchema=function(){function ReactJsonSchema(){_classCallCheck(this,ReactJsonSchema)}_createClass(ReactJsonSchema,[{key:"parseSchema",value:function parseSchema(schema){var element=null;var elements=null;if((0,_lodash.isArray)(schema)){elements=this.parseSubSchemas(schema)}else{element=this.createComponent(schema)}return element||elements}},{key:"parseSubSchemas",value:function parseSubSchemas(subSchemas){var _this=this;var Components=[];(0,_lodash.forEach)(subSchemas,function(subSchema,index){subSchema.key=index;Components.push(_this.parseSchema(subSchema))});return Components}},{key:"createComponent",value:function createComponent(schema){var props=(0,_lodash.clone)(schema);props=(0,_lodash.omit)(props,["component","children"]);var Component=this.resolveComponent(schema);var Children=props.text||this.resolveComponentChildren(schema);return(0,_react.createElement)(Component,props,Children)}},{key:"resolveComponent",value:function resolveComponent(schema){var Component=null;if((0,_lodash.has)(schema,"component")){if((0,_lodash.isObject)(schema.component)){Component=schema.component}else if(_componentMap&&_componentMap[schema.component]){Component=_componentMap[schema.component]}else if((0,_lodash.has)(_node_modulesReactLibReactDOMFactories2["default"],schema.component)){Component=schema.component}}else{throw new Error("ReactJsonSchema could not resolve a component due to a missing component attribute in the schema.")}return Component}},{key:"resolveComponentChildren",value:function resolveComponentChildren(schema){return(0,_lodash.has)(schema,"children")?this.parseSchema(schema.children):[]}},{key:"getComponentMap",value:function getComponentMap(){return _componentMap}},{key:"setComponentMap",value:function setComponentMap(componentMap){_componentMap=componentMap}}]);return ReactJsonSchema}();exports["default"]=ReactJsonSchema;module.exports=exports["default"];
\ No newline at end of file
+"use strict";var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor)}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor}}();Object.defineProperty(exports,"__esModule",{value:true});var _react=require("react");var _ReactDOMFactories=require("react/lib/ReactDOMFactories");var _ReactDOMFactories2=_interopRequireDefault(_ReactDOMFactories);var _lodash=require("lodash");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{"default":obj}}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function")}}var _componentMap=null;var ReactJsonSchema=function(){function ReactJsonSchema(){_classCallCheck(this,ReactJsonSchema)}_createClass(ReactJsonSchema,[{key:"parseSchema",value:function parseSchema(schema){var element=null;var elements=null;if((0,_lodash.isArray)(schema)){elements=this.parseSubSchemas(schema)}else{element=this.createComponent(schema)}return element||elements}},{key:"parseSubSchemas",value:function parseSubSchemas(subSchemas){var _this=this;var Components=[];(0,_lodash.forEach)(subSchemas,function(subSchema,index){subSchema.key=index;Components.push(_this.parseSchema(subSchema))});return Components}},{key:"createComponent",value:function createComponent(schema){var props=(0,_lodash.clone)(schema);props=(0,_lodash.omit)(props,["component","children"]);var Component=this.resolveComponent(schema);var Children=props.text||this.resolveComponentChildren(schema);return(0,_react.createElement)(Component,props,Children)}},{key:"resolveComponent",value:function resolveComponent(schema){var Component=null;if((0,_lodash.has)(schema,"component")){if((0,_lodash.isObject)(schema.component)){Component=schema.component}else if(_componentMap&&_componentMap[schema.component]){Component=_componentMap[schema.component]}else if((0,_lodash.has)(_ReactDOMFactories2.default,schema.component)){Component=schema.component}}else{throw new Error("ReactJsonSchema could not resolve a component due to a missing component attribute in the schema.")}return Component}},{key:"resolveComponentChildren",value:function resolveComponentChildren(schema){return(0,_lodash.has)(schema,"children")?this.parseSchema(schema.children):[]}},{key:"getComponentMap",value:function getComponentMap(){return _componentMap}},{key:"setComponentMap",value:function setComponentMap(componentMap){_componentMap=componentMap}}]);return ReactJsonSchema}();exports.default=ReactJsonSchema;
\ No newline at end of file
diff --git a/lib/ReactJsonSchema.js b/lib/ReactJsonSchema.js
index bf9c0b6..ae64dc6 100644
--- a/lib/ReactJsonSchema.js
+++ b/lib/ReactJsonSchema.js
@@ -1,6 +1,6 @@
 import { createElement } from 'react';
-import ReactDOMFactories from '../node_modules/react/lib/ReactDOMFactories';
-import { isFunction, isArray, forEach, omit, clone, has, isObject, isString } from 'lodash';
+import ReactDOMFactories from 'react/lib/ReactDOMFactories';
+import { isArray, forEach, omit, clone, has, isObject } from 'lodash';
 
 let _componentMap = null;
 
@@ -44,7 +44,7 @@ export default class ReactJsonSchema {
       } else if (has(ReactDOMFactories, schema.component)) {
         Component = schema.component;
       }
-    }  else {
+    } else {
       throw new Error('ReactJsonSchema could not resolve a component due to a missing component attribute in the schema.');
     }
     return Component;
diff --git a/package.json b/package.json
index a6bb05d..87dfc6c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-json-schema",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Write component schema in JSON; parse to create react elements.",
   "keywords": [
     "react",
@@ -37,9 +37,12 @@
     "react": "^0.14.2"
   },
   "devDependencies": {
-    "babel-core": "^5.8.25",
+    "babel-cli": "^6.4.0",
+    "babel-core": "^6.4.0",
     "babel-eslint": "^4.1.3",
-    "babel-loader": "^5.3.2",
+    "babel-loader": "6.1.0",
+    "babel-preset-es2015": "6.1.18",
+    "babel-preset-react": "6.1.18",
     "bootstrap": "^3.3.5",
     "eslint": "^1.5.1",
     "eslint-config-airbnb": "^0.1.0",
diff --git a/webpack.config.demo.js b/webpack.config.demo.js
index 8c6d6d7..04f67a2 100644
--- a/webpack.config.demo.js
+++ b/webpack.config.demo.js
@@ -1,7 +1,3 @@
-/* eslint "esnext": false */
-
-'use strict';
-
 module.exports = {
   entry: {
     javascript: './demo/index.jsx',
@@ -13,14 +9,13 @@ module.exports = {
   },
   module: {
     loaders: [
-      {
-        test: /\.jsx$/,
-        loader: 'jsx-loader'
-      },
       {
         test: /\.js|jsx$/,
         exclude: /node_modules/,
-        loader: 'babel-loader'
+        loader: 'babel-loader',
+        query: {
+          presets: ['react', 'es2015']
+        }
       },
       {
         test: /\.html$/,
diff --git a/webpack.config.spec.js b/webpack.config.spec.js
index 15215c0..236d38c 100644
--- a/webpack.config.spec.js
+++ b/webpack.config.spec.js
@@ -1,14 +1,10 @@
-/* eslint "esnext": false */
-
-'use strict';
-
 var path = require('path');
 var srcPath = path.join(__dirname, './spec');
 
 module.exports = {
   entry: {
-    javascript:  path.join(srcPath, 'spec.entry'),
-    html:  path.join(srcPath, 'index.html')
+    javascript: path.join(srcPath, 'spec.entry'),
+    html: path.join(srcPath, 'index.html')
   },
   output: {
     path: srcPath,
@@ -17,14 +13,13 @@ module.exports = {
   },
   module: {
     loaders: [
-      {
-        test: /\.js|jsx$/,
-        loader: 'jsx-loader'
-      },
       {
         test: /\.js|jsx$/,
         exclude: /node_modules/,
-        loader: 'babel-loader'
+        loader: 'babel-loader',
+        query: {
+          presets: ['react', 'es2015']
+        }
       },
       {
         test: /\.html$/,