diff --git a/build/simple-modal.js b/build/simple-modal.js
index 0ecfaad..36715c0 100755
--- a/build/simple-modal.js
+++ b/build/simple-modal.js
@@ -44,13 +44,13 @@ var Modal = (function (_React$Component) {
     key: 'render',
     value: function render() {
       if (!this.props.show) return null;
-      var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
-      var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
-
       //completely overwrite if they use a class
       if (this.props.className) {
         modalStyle = this.props.style;
         containerStyle = this.props.containerStyle;
+      } else {
+        var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
+        var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
       }
 
       return _react2['default'].createElement(
diff --git a/dist/simple-react-modal.js b/dist/simple-react-modal.js
index f2e5d63..3e8e8e5 100644
--- a/dist/simple-react-modal.js
+++ b/dist/simple-react-modal.js
@@ -46,13 +46,13 @@ var Modal = (function (_React$Component) {
     key: 'render',
     value: function render() {
       if (!this.props.show) return null;
-      var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
-      var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
-
       //completely overwrite if they use a class
       if (this.props.className) {
         modalStyle = this.props.style;
         containerStyle = this.props.containerStyle;
+      } else {
+        var modalStyle = _extends({}, _styles2['default'].modal, this.props.style);
+        var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle);
       }
 
       return _react2['default'].createElement(
diff --git a/dist/simple-react-modal.min.js b/dist/simple-react-modal.min.js
index cce9a6e..509e15c 100644
--- a/dist/simple-react-modal.min.js
+++ b/dist/simple-react-modal.min.js
@@ -1 +1 @@
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.simpleModal=e()}}(function(){return function e(t,o,n){function r(l,u){if(!o[l]){if(!t[l]){var a="function"==typeof require&&require;if(!u&&a)return a(l,!0);if(i)return i(l,!0);var f=new Error("Cannot find module '"+l+"'");throw f.code="MODULE_NOT_FOUND",f}var s=o[l]={exports:{}};t[l][0].call(s.exports,function(e){var o=t[l][1][e];return r(o?o:e)},s,s.exports,e,t,o,n)}return o[l].exports}for(var i="function"==typeof require&&require,l=0;l<n.length;l++)r(n[l]);return r}({1:[function(e,t,o){(function(t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(o,"__esModule",{value:!0});var l=function(){function e(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(t,o,n){return o&&e(t.prototype,o),n&&e(t,n),t}}(),u=function(e,t,o){for(var n=!0;n;){var r=e,i=t,l=o;u=f=a=void 0,n=!1,null===r&&(r=Function.prototype);var u=Object.getOwnPropertyDescriptor(r,i);if(void 0!==u){if("value"in u)return u.value;var a=u.get;return void 0===a?void 0:a.call(l)}var f=Object.getPrototypeOf(r);if(null===f)return void 0;e=f,t=i,o=l,n=!0}},a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(e[n]=o[n])}return e},f="undefined"!=typeof window?window.React:"undefined"!=typeof t?t.React:null,s=n(f),p=e("./styles"),c=n(p),d=function(e){function t(e){r(this,t),u(Object.getPrototypeOf(t.prototype),"constructor",this).call(this),this.hideOnOuterClick=this.hideOnOuterClick.bind(this)}return i(t,e),l(t,[{key:"hideOnOuterClick",value:function(e){this.props.closeOnOuterClick!==!1&&e.target.dataset.modal&&this.props.onClose(e)}},{key:"render",value:function(){if(!this.props.show)return null;var e=a({},c["default"].modal,this.props.style),t=a({},c["default"].container,this.props.containerStyle);return this.props.className&&(e=this.props.style,t=this.props.containerStyle),s["default"].createElement("div",a({},this.props,{style:e,onClick:this.hideOnOuterClick,"data-modal":"true"}),s["default"].createElement("div",{style:t},this.props.children))}}]),t}(s["default"].Component);o["default"]=d;var y=c["default"].close;o.closeStyle=y}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./styles":2}],2:[function(e,t,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0});var n={position:"fixed",fontFamily:"Arial, Helvetica, sans-serif",top:0,right:0,bottom:0,left:0,background:"rgba(0, 0, 0, 0.8)",zIndex:99999,transition:"opacity 400ms ease-in",opacity:1,pointerEvents:"auto"},r={width:"400px",position:"relative",margin:"10% auto",padding:"5px 20px 13px 20px",background:"#fff"},i={background:"#606061",color:"#FFFFFF",lineHeight:"25px",position:"absolute",right:"-12px",textAlign:"center",top:"-10px",width:"24px",textDecoration:"none",fontWeight:"bold",borderRadius:"12px",boxShadow:"1px 1px 3px #000",cursor:"pointer"};o["default"]={modal:n,container:r,close:i},t.exports=o["default"]},{}]},{},[1])(1)});
\ No newline at end of file
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.simpleModal=e()}}(function(){return function e(t,o,n){function r(l,u){if(!o[l]){if(!t[l]){var a="function"==typeof require&&require;if(!u&&a)return a(l,!0);if(i)return i(l,!0);var f=new Error("Cannot find module '"+l+"'");throw f.code="MODULE_NOT_FOUND",f}var s=o[l]={exports:{}};t[l][0].call(s.exports,function(e){var o=t[l][1][e];return r(o?o:e)},s,s.exports,e,t,o,n)}return o[l].exports}for(var i="function"==typeof require&&require,l=0;l<n.length;l++)r(n[l]);return r}({1:[function(e,t,o){(function(t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(o,"__esModule",{value:!0});var l=function(){function e(e,t){for(var o=0;o<t.length;o++){var n=t[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}return function(t,o,n){return o&&e(t.prototype,o),n&&e(t,n),t}}(),u=function(e,t,o){for(var n=!0;n;){var r=e,i=t,l=o;u=f=a=void 0,n=!1,null===r&&(r=Function.prototype);var u=Object.getOwnPropertyDescriptor(r,i);if(void 0!==u){if("value"in u)return u.value;var a=u.get;return void 0===a?void 0:a.call(l)}var f=Object.getPrototypeOf(r);if(null===f)return void 0;e=f,t=i,o=l,n=!0}},a=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(e[n]=o[n])}return e},f="undefined"!=typeof window?window.React:"undefined"!=typeof t?t.React:null,s=n(f),p=e("./styles"),c=n(p),d=function(e){function t(e){r(this,t),u(Object.getPrototypeOf(t.prototype),"constructor",this).call(this),this.hideOnOuterClick=this.hideOnOuterClick.bind(this)}return i(t,e),l(t,[{key:"hideOnOuterClick",value:function(e){this.props.closeOnOuterClick!==!1&&e.target.dataset.modal&&this.props.onClose(e)}},{key:"render",value:function(){if(!this.props.show)return null;if(this.props.className)e=this.props.style,t=this.props.containerStyle;else var e=a({},c["default"].modal,this.props.style),t=a({},c["default"].container,this.props.containerStyle);return s["default"].createElement("div",a({},this.props,{style:e,onClick:this.hideOnOuterClick,"data-modal":"true"}),s["default"].createElement("div",{style:t},this.props.children))}}]),t}(s["default"].Component);o["default"]=d;var y=c["default"].close;o.closeStyle=y}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./styles":2}],2:[function(e,t,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0});var n={position:"fixed",fontFamily:"Arial, Helvetica, sans-serif",top:0,right:0,bottom:0,left:0,background:"rgba(0, 0, 0, 0.8)",zIndex:99999,transition:"opacity 400ms ease-in",opacity:1,pointerEvents:"auto"},r={width:"400px",position:"relative",margin:"10% auto",padding:"5px 20px 13px 20px",background:"#fff"},i={background:"#606061",color:"#FFFFFF",lineHeight:"25px",position:"absolute",right:"-12px",textAlign:"center",top:"-10px",width:"24px",textDecoration:"none",fontWeight:"bold",borderRadius:"12px",boxShadow:"1px 1px 3px #000",cursor:"pointer"};o["default"]={modal:n,container:r,close:i},t.exports=o["default"]},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/example/src/example.js b/example/src/example.js
index 1f345e8..2a043d7 100755
--- a/example/src/example.js
+++ b/example/src/example.js
@@ -25,8 +25,8 @@ export default class App extends React.Component{
         show={this.state.show}
         onClose={this.close.bind(this)}>
 
-        <a style={closeStyle} onClick={this.close.bind(this)}>X</a>
-        <div>hey</div>
+        <a key="close" style={closeStyle} onClick={this.close.bind(this)}>X</a>
+        <div key="content">hey</div>
 
         </Modal>
       </div>
diff --git a/package.json b/package.json
index 05a42ce..5ca07cd 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "simple-react-modal",
   "description": "The simplest modal",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "main": "./build/simple-modal.js",
   "directories": {
     "example": "example"
diff --git a/src/simple-modal.js b/src/simple-modal.js
index 3b4e45d..ad458db 100755
--- a/src/simple-modal.js
+++ b/src/simple-modal.js
@@ -15,14 +15,15 @@ export default class Modal extends React.Component{
 
   render(){
     if(!this.props.show) return null
-    var modalStyle = Object.assign({},styles.modal,this.props.style)
-    var containerStyle = Object.assign({},styles.container,this.props.containerStyle)
-
     //completely overwrite if they use a class
     if(this.props.className){
       modalStyle = this.props.style
       containerStyle = this.props.containerStyle
     }
+    else{
+      var modalStyle = Object.assign({}, styles.modal ,this.props.style)
+      var containerStyle = Object.assign({},styles.container,this.props.containerStyle)
+    }
 
     return (
       <div {...this.props} style={modalStyle} onClick={this.hideOnOuterClick} data-modal="true">