diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..99f7c65
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,8 @@
+{
+    "extends": "airbnb",
+    "plugins": [
+        "react",
+        "jsx-a11y",
+        "import"
+    ]
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 4acd9c1..edcaf46 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,11 @@
     "babel-preset-stage-1": "^6.24.1",
     "babel-runtime": "^6.0.0",
     "css-loader": "^0.18.0",
+    "eslint": "^4.9.0",
+    "eslint-config-airbnb": "^16.1.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-react": "^7.4.0",
     "extract-text-webpack-plugin": "^0.8.2",
     "file-loader": "^0.8.4",
     "flow-bin": "^0.56.0",
@@ -35,7 +40,8 @@
     "webpack": "^1.12.0"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "eslint ./src"
   },
   "repository": {
     "type": "git",
diff --git a/src/__tests__/Icon-test.js b/src/__tests__/Icon-test.js
index b3f638a..063fbef 100644
--- a/src/__tests__/Icon-test.js
+++ b/src/__tests__/Icon-test.js
@@ -3,62 +3,62 @@
  */
 
 import React from 'react';
-import {renderToString} from 'react-dom/server';
+import { renderToString } from 'react-dom/server';
 import Icon from '../Icon';
 
-describe('Icon', function() {
-  it('renders Font Awesome className', function() {
-    let markup = renderToString(<Icon name="plus" />);
+describe('Icon', function () {
+  it('renders Font Awesome className', function () {
+    const markup = renderToString(<Icon name="plus" />);
     expect(/<span class="fa fa-plus"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "size"', function() {
-    let markup = renderToString(<Icon size="lg" name="plus" />);
+  it('supports "size"', function () {
+    const markup = renderToString(<Icon size="lg" name="plus" />);
     expect(/<span class="fa fa-plus fa-lg"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "rotate"', function() {
-    let markup = renderToString(<Icon rotate="45" name="plus" />);
+  it('supports "rotate"', function () {
+    const markup = renderToString(<Icon rotate="45" name="plus" />);
     expect(/<span class="fa fa-plus fa-rotate-45"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "flip"', function() {
-    let markup = renderToString(<Icon flip="horizontal" name="plus" />);
+  it('supports "flip"', function () {
+    const markup = renderToString(<Icon flip="horizontal" name="plus" />);
     expect(/<span class="fa fa-plus fa-flip-horizontal"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "fixedWidth"', function() {
-    let markup = renderToString(<Icon fixedWidth name="plus" />);
+  it('supports "fixedWidth"', function () {
+    const markup = renderToString(<Icon fixedWidth name="plus" />);
     expect(/<span class="fa fa-plus fa-fw"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "spin"', function() {
-    let markup = renderToString(<Icon spin name="plus" />);
+  it('supports "spin"', function () {
+    const markup = renderToString(<Icon spin name="plus" />);
     expect(/<span class="fa fa-plus fa-spin"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "pulse"', function() {
-    let markup = renderToString(<Icon pulse name="plus" />);
+  it('supports "pulse"', function () {
+    const markup = renderToString(<Icon pulse name="plus" />);
     expect(/<span class="fa fa-plus fa-pulse"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "stack"', function() {
-    let markup = renderToString(<Icon stack="2x" name="plus" />);
+  it('supports "stack"', function () {
+    const markup = renderToString(<Icon stack="2x" name="plus" />);
     expect(/<span class="fa fa-plus fa-stack-2x"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports "inverse"', function() {
-    let markup = renderToString(<Icon inverse name="plus" />);
+  it('supports "inverse"', function () {
+    const markup = renderToString(<Icon inverse name="plus" />);
     expect(/<span class="fa fa-plus fa-inverse"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports custom className', function() {
-    let markup = renderToString(<Icon className="x" name="plus" />);
+  it('supports custom className', function () {
+    const markup = renderToString(<Icon className="x" name="plus" />);
     expect(/<span class="fa fa-plus x"/.exec(markup)).toBeTruthy();
   });
 
-  it('can be rendered using different DOM component', function() {
-    let markup = renderToString(<Icon Component="i" name="plus" />);
+  it('can be rendered using different DOM component', function () {
+    const markup = renderToString(<Icon Component="i" name="plus" />);
     expect(/<i class="fa fa-plus"/.exec(markup)).toBeTruthy();
   });
 });
diff --git a/src/__tests__/IconStack-test.js b/src/__tests__/IconStack-test.js
index 1b37911..c455ed0 100644
--- a/src/__tests__/IconStack-test.js
+++ b/src/__tests__/IconStack-test.js
@@ -3,13 +3,13 @@
  */
 
 import React from 'react';
-import {renderToString} from 'react-dom/server';
+import { renderToString } from 'react-dom/server';
 import Icon from '../Icon';
 import IconStack from '../IconStack';
 
-describe('IconStack', function() {
-  it('renders icon stack container with default size', function() {
-    let markup = renderToString(
+describe('IconStack', function () {
+  it('renders icon stack container with default size', function () {
+    const markup = renderToString(
       <IconStack>
         <Icon name="plus" />
       </IconStack>,
@@ -17,8 +17,8 @@ describe('IconStack', function() {
     expect(/<span class="fa-stack"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports optional "size"', function() {
-    let markup = renderToString(
+  it('supports optional "size"', function () {
+    const markup = renderToString(
       <IconStack size="2x">
         <Icon name="plus" />
       </IconStack>,
@@ -26,8 +26,8 @@ describe('IconStack', function() {
     expect(/<span class="fa-stack fa-2x"/.exec(markup)).toBeTruthy();
   });
 
-  it('supports custom className', function() {
-    let markup = renderToString(
+  it('supports custom className', function () {
+    const markup = renderToString(
       <IconStack className="x">
         <Icon name="plus" />
       </IconStack>,
diff --git a/src/index.js b/src/index.js
index 4a06b51..78c9d52 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,4 +8,4 @@ import 'font-awesome/css/font-awesome.css';
 import Icon from './Icon';
 import IconStack from './IconStack';
 
-export {Icon as default, Icon, IconStack};
+export { Icon as default, Icon, IconStack };