diff --git a/.eslintrc.yml b/.eslintrc.yml
new file mode 100644
index 0000000..f3719ee
--- /dev/null
+++ b/.eslintrc.yml
@@ -0,0 +1,25 @@
+env:
+  browser: true
+  es6: true
+extends: 'eslint:recommended'
+installedESLint: true
+parserOptions:
+  ecmaFeatures:
+    experimentalObjectRestSpread: true
+    jsx: true
+  sourceType: module
+plugins:
+  - react
+rules:
+  indent:
+    - error
+    - 2
+  linebreak-style:
+    - error
+    - unix
+  quotes:
+    - error
+    - single
+  semi:
+    - error
+    - never
diff --git a/package.json b/package.json
index c2e8fff..996a49a 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,8 @@
   "devDependencies": {
     "babel": "^5.8.23",
     "chai": "^3.3.0",
+    "eslint": "3.2.2",
+    "eslint-plugin-react": "6.0.0",
     "gulp": "^3.8.11",
     "legit-tests": "^0.4.4",
     "mocha": "^2.3.3",
diff --git a/src/simple-modal.js b/src/simple-modal.js
index b11b337..492256c 100755
--- a/src/simple-modal.js
+++ b/src/simple-modal.js
@@ -11,11 +11,11 @@ export default class Modal extends React.Component{
 
     let opacity = 0,
       display = 'block',
-      visibility = 'hidden';
+      visibility = 'hidden'
 
     if(props.show){
-      opacity = 1;
-      display = 'block';
+      opacity = 1
+      display = 'block'
       visibility = 'visible'
     }
 
@@ -24,13 +24,13 @@ export default class Modal extends React.Component{
       display,
       visibility,
       show: props.show
-    };
+    }
 
   }
 
   hideOnOuterClick(event){
     if(this.props.closeOnOuterClick === false) return
-    if(event.target.dataset.modal) this.props.onClose(event)
+    if(event.target.dataset.modal && this.props.onClose instanceof Function) this.props.onClose(event)
   }
 
   componentWillReceiveProps(props){
@@ -78,7 +78,7 @@ export default class Modal extends React.Component{
     if(this.props.transitionSpeed) modalStyle = Object.assign({}, this.state, modalStyle)
 
     return (
-      <div {...this.props} style={modalStyle} onClick={this.hideOnOuterClick} data-modal="true">
+      <div {..._filteredProps(this.props)} style={modalStyle} onClick={this.hideOnOuterClick} data-modal="true">
         <div className={this.props.containerClassName} style={containerStyle}>
           {this.props.children}
         </div>
@@ -86,4 +86,19 @@ export default class Modal extends React.Component{
     )
   }
 }
+
+function _filteredProps(props) {
+  const filtered = Object.assign({}, props);
+  [
+    'containerStyle',
+    'containerClassName',
+    'closeOnOuterClick',
+    'show',
+    'onClose'
+  ].map( p => {
+    delete filtered[p]
+  })
+  return filtered
+}
+
 export var closeStyle = styles.close