diff --git a/.eslintrc b/.eslintrc
index 474a8cd263..9e04dadbb5 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -13,6 +13,7 @@
 		"no-trailing-spaces": 0,
 		"no-underscore-dangle": 0,
 		"no-unused-expressions": 0,
+		"object-curly-spacing": [1, "always"],
 		"quotes": [2, "single", "avoid-escape"],
 		"react/jsx-quotes": 1,
 		"react/jsx-no-undef": 1,
diff --git a/package.json b/package.json
index 12d81cefed..6a3320a107 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "babel-eslint": "^3.1.1",
     "babel-jest": "^5.2.0",
-    "eslint": "^0.21.0",
+    "eslint": "^0.22.1",
     "eslint-plugin-react": "^2.2.0",
     "gulp": "^3.8.11",
     "jest-cli": "^0.4.2",
@@ -44,7 +44,7 @@
     "bump:minor": "gulp bump:minor",
     "dev": "gulp dev",
     "examples": "gulp dev:server",
-    "lint": "eslint ./; true",
+    "lint": "eslint .",
     "release": "gulp release",
     "test": "jest; true",
     "watch": "gulp watch:lib"
diff --git a/src/Select.js b/src/Select.js
index 22da4e8fec..ca53283af0 100644
--- a/src/Select.js
+++ b/src/Select.js
@@ -131,10 +131,10 @@ var Select = React.createClass({
 				document.removeEventListener('click', this._closeMenuIfClickedOutside);
 			}
 		};
-    
-		this.setState(this.getStateFromValue(this.props.value),function(){
-		  //Executes after state change is done. Fixes issue #201
-		  if (this.props.asyncOptions && this.props.autoload) {
+
+		this.setState(this.getStateFromValue(this.props.value), function(){
+			//Executes after state change is done. Fixes issue #201
+			if (this.props.asyncOptions && this.props.autoload) {
 				this.autoloadAsyncOptions();
 			}
     });
@@ -378,8 +378,8 @@ var Select = React.createClass({
 			break;
 
 			case 13: // enter
-				if (!this.state.isOpen) return
-				
+				if (!this.state.isOpen) return;
+
 				this.selectFocusedOption();
 			break;
 
@@ -404,7 +404,7 @@ var Select = React.createClass({
 					event.preventDefault();
 					event.stopPropagation();
 					this.selectFocusedOption();
-				};
+				}
 			break;
 
 			default: return;
@@ -547,7 +547,7 @@ var Select = React.createClass({
 	selectFocusedOption: function() {
 		if (this.props.allowCreate && !this.state.focusedOption) {
 			return this.selectValue(this.state.inputValue);
-		};
+		}
 		return this.selectValue(this.state.focusedOption);
 	},
 
@@ -632,7 +632,7 @@ var Select = React.createClass({
 				label: inputValue,
 				create: true
 			});
-		};
+		}
 
 		var ops = Object.keys(this.state.filteredOptions).map(function(key) {
 			var op = this.state.filteredOptions[key];
@@ -653,7 +653,7 @@ var Select = React.createClass({
 			if (op.disabled) {
 				return <div ref={ref} key={'option-' + op.value} className={optionClass}>{op.label}</div>;
 			} else {
-				return <div ref={ref} key={'option-' + op.value} className={optionClass} onMouseEnter={mouseEnter} onMouseLeave={mouseLeave} onMouseDown={mouseDown} onClick={mouseDown}>{ op.create ? "Add "+op.label+" ?" : op.label}</div>;
+				return <div ref={ref} key={'option-' + op.value} className={optionClass} onMouseEnter={mouseEnter} onMouseLeave={mouseLeave} onMouseDown={mouseDown} onClick={mouseDown}>{ op.create ? 'Add ' + op.label + ' ?' : op.label}</div>;
 			}
 		}, this);