diff --git a/CHANGELOG.md b/CHANGELOG.md
index be4f380..d029a29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
-*Breaking:* If you want selected options to no longer appear in the select, you
-now _must_ either pass them back to `FilteredMultiSelect` via its
-`selectedOptions` prop or manually remove them from the `options` list.
+## 0.2.0 - 2014-12-06
 
-A `FilteredMultiSelect` will now update its display if its `options` list's
-`.length` changes or is no longer `===` the previous `options` list.
+**Breaking:** If you want selected options to no longer appear in the select,
+you now _must_ either pass them back to `FilteredMultiSelect` via its
+`selectedOptions` prop or manually remove them from list that gets passed as its
+ `options` prop.
 
-Now using ES6 transforms when transpiling.
+Fixed: `FilteredMultiSelect` will now re-render if its `options` prop is
+replaced with another object, or `options.length` changes.
 
 Removed React from package.json `dependencies` - it's now only in
 `peerDependencies`.
diff --git a/README.md b/README.md
index ccbb5d3..10086cd 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ var FilteredMultiSelect = require('react-filtered-multiselect')
 Browser bundles export a global ``FilteredMultiSelect`` variable and expect to
 find a global ``React`` variable to work with.
 
-*v0.1.0*
+*v0.2.0*
 * [react-filtered-multiselect.js](https://github.com/insin/react-filtered-multiselect/raw/master/dist/react-filtered-multiselect.js) (development version)
 * [react-filtered-multiselect.min.js](https://github.com/insin/react-filtered-multiselect/raw/master/dist/react-filtered-multiselect.min.js) (compressed production version)
 
diff --git a/dist/react-filtered-multiselect.js b/dist/react-filtered-multiselect.js
index 2c2a8a3..6cb10ef 100644
--- a/dist/react-filtered-multiselect.js
+++ b/dist/react-filtered-multiselect.js
@@ -1,5 +1,5 @@
 /**
- * react-filtered-multiselect 0.1.1 - https://github.com/insin/react-filtered-multiselect
+ * react-filtered-multiselect 0.2.0 - https://github.com/insin/react-filtered-multiselect
  * MIT Licensed
  */
 !function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.FilteredMultiSelect=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
@@ -51,7 +51,7 @@ var FilteredMultiSelect = React.createClass({displayName: 'FilteredMultiSelect',
   , valueProp: React.PropTypes.string
   },
 
-  getDefaultProps: function() {
+  getDefaultProps:function() {
     return {
       buttonText: 'Select'
     , className: 'FilteredMultiSelect'
@@ -70,41 +70,47 @@ var FilteredMultiSelect = React.createClass({displayName: 'FilteredMultiSelect',
     }
   },
 
-  getInitialState: function() {
+  getInitialState:function() {
+    var $__0=   this.props,defaultFilter=$__0.defaultFilter,selectedOptions=$__0.selectedOptions
     return {
       // Filter text
-      filter: this.props.defaultFilter
+      filter: defaultFilter
       // Options which haven't been selected and match the filter text
-    , filteredOptions: this.filterOptions(this.props.defaultFilter,
-                                          this.props.selectedOptions)
-      // Options which have been selected by pressing Enter or the Select button
-    , selectedOptions: this.props.selectedOptions.slice()
+    , filteredOptions: this._filterOptions(defaultFilter, selectedOptions)
       // Values of <options> currently selected in the <select>
     , selectedValues: []
     }
   },
 
-  componentWillReceiveProps: function(nextProps) {
-    if (nextProps.selectedOptions.length != this.state.selectedOptions.length) {
+  componentWillReceiveProps:function(nextProps) {
+    // Update visibile options in response to options or selectedOptions
+    // changing. Also update selected values after the re-render completes, as
+    // one of the previously selected options may have been removed.
+    if (nextProps.options !== this.props.options ||
+        nextProps.selectedOptions !== this.props.selectedOptions ||
+        nextProps.options.length != this.props.options.length ||
+        nextProps.selectedOptions.length != this.props.selectedOptions.length) {
       this.setState({
-        filteredOptions: this.filterOptions(this.state.filter, nextProps.selectedOptions)
-      , selectedOptions: nextProps.selectedOptions.slice()
-      })
+        filteredOptions: this._filterOptions(this.state.filter,
+                                             nextProps.selectedOptions,
+                                             nextProps.options)
+      }, this._updateSelectedValues)
     }
   },
 
-  filterOptions: function(filter, selectedOptions) {
+  _filterOptions:function(filter, selectedOptions, options) {
     if (typeof filter == 'undefined') {
       filter = this.state.filter
     }
     if (typeof selectedOptions == 'undefined') {
-      selectedOptions = this.state.selectedOptions
+      selectedOptions = this.props.selectedOptions
+    }
+    if (typeof options == 'undefined') {
+      options = this.props.options
     }
     filter = filter.toUpperCase()
 
-    var options = this.props.options
-    var textProp = this.props.textProp
-    var valueProp = this.props.valueProp
+    var $__0=   this.props,textProp=$__0.textProp,valueProp=$__0.valueProp
     var selectedValueLookup = makeLookup(selectedOptions, valueProp)
     var filteredOptions = []
 
@@ -118,79 +124,79 @@ var FilteredMultiSelect = React.createClass({displayName: 'FilteredMultiSelect',
     return filteredOptions
   },
 
-  onFilterChange: function(e) {
+  _onFilterChange:function(e) {
     var filter = e.target.value
     this.setState({
-      filter: filter
-    , filteredOptions: this.filterOptions(filter)
-    })
+      filter:filter
+    , filteredOptions: this._filterOptions(filter)
+    }, this._updateSelectedValues)
   },
 
-  onFilterKeyPress: function(e) {
+  _onFilterKeyPress:function(e) {
     if (e.key == 'Enter') {
       e.preventDefault()
       if (this.state.filteredOptions.length == 1) {
         var selectedOption = this.state.filteredOptions[0]
-        var selectedOptions = this.state.selectedOptions.slice().concat([selectedOption])
-        this.setState({
-          filter: ''
-        , filteredOptions: this.filterOptions('', selectedOptions)
-        , selectedOptions: selectedOptions
-        }, this.props.onChange.bind(null, selectedOptions))
+        var selectedOptions = this.props.selectedOptions.concat([selectedOption])
+        this.setState({filter: '', selectedValues: []}, function()  {
+          this.props.onChange(selectedOptions)
+        }.bind(this))
       }
     }
   },
 
-  onSelectChange: function(e) {
-    var el = e.target
+  _updateSelectedValues:function(e) {
+    var el = e ? e.target : this.refs.select.getDOMNode()
     var selectedValues = []
     for (var i = 0, l = el.options.length; i < l; i++) {
       if (el.options[i].selected) {
         selectedValues.push(el.options[i].value)
       }
     }
-    this.setState({selectedValues: selectedValues})
+    // Always update if we were handling an event, otherwise only update if
+    // selectedValues has actually changed.
+    if (e || String(this.state.selectedValues) != String(selectedValues)) {
+      this.setState({selectedValues:selectedValues})
+    }
   },
 
-  selectOptions: function(e) {
+  _onButtonClick:function(e) {
     var selectedOptions =
-      this.state.selectedOptions.concat(getItemsByProp(this.state.filteredOptions,
+      this.props.selectedOptions.concat(getItemsByProp(this.state.filteredOptions,
                                                        this.props.valueProp,
                                                        this.state.selectedValues))
-    this.setState({
-      filteredOptions: this.filterOptions(this.state.filter, selectedOptions)
-    , selectedOptions: selectedOptions
-    , selectedValues: []
-    }, this.props.onChange.bind(null, selectedOptions))
+    this.setState({selectedValues: []}, function()  {
+      this.props.onChange(selectedOptions)
+    }.bind(this))
   },
 
-  render: function() {
-    var props = this.props
-    var state = this.state
+  render:function() {
+    var $__0=   this,props=$__0.props,state=$__0.state
     return React.createElement("div", {className: props.className}, 
       React.createElement("input", {
          type: "text", 
          className: props.classNames.filter, 
          placeholder: props.placeholder, 
          value: state.filter, 
-         onChange: this.onFilterChange, 
-         onKeyPress: this.onFilterKeyPress, 
+         onChange: this._onFilterChange, 
+         onKeyPress: this._onFilterKeyPress, 
          disabled: props.disabled}
       ), 
       React.createElement("select", {multiple: true, 
+         ref: "select", 
          className: props.classNames.select, 
          size: props.size, 
          value: state.selectedValues, 
-         onChange: this.onSelectChange, 
+         onChange: this._updateSelectedValues, 
          disabled: props.disabled}, 
-        this.state.filteredOptions.map(function(option) {
+        this.state.filteredOptions.map(function(option)  {
           return React.createElement("option", {key: option[props.valueProp], value: option[props.valueProp]}, option[props.textProp])
         })
       ), 
       React.createElement("button", {type: "button", 
          className: props.classNames.button, 
          disabled: state.selectedValues.length === 0, 
-         onClick: this.selectOptions}, 
+         onClick: this._onButtonClick}, 
         this.props.buttonText
       )
     )
diff --git a/dist/react-filtered-multiselect.min.js b/dist/react-filtered-multiselect.min.js
index 11fdf3c..156e05e 100644
--- a/dist/react-filtered-multiselect.min.js
+++ b/dist/react-filtered-multiselect.min.js
@@ -1,5 +1,5 @@
 /**
- * react-filtered-multiselect 0.1.1 - https://github.com/insin/react-filtered-multiselect
+ * react-filtered-multiselect 0.2.0 - https://github.com/insin/react-filtered-multiselect
  * MIT Licensed
  */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;"undefined"!=typeof window?t=window:"undefined"!=typeof global?t=global:"undefined"!=typeof self&&(t=self),t.FilteredMultiSelect=e()}}(function(){return function e(t,s,i){function n(o,r){if(!s[o]){if(!t[o]){var p="function"==typeof require&&require;if(!r&&p)return p(o,!0);if(l)return l(o,!0);var a=new Error("Cannot find module '"+o+"'");throw a.code="MODULE_NOT_FOUND",a}var u=s[o]={exports:{}};t[o][0].call(u.exports,function(e){var s=t[o][1][e];return n(s?s:e)},u,u.exports,e,t,s,i)}return s[o].exports}for(var l="function"==typeof require&&require,o=0;o<i.length;o++)n(i[o]);return n}({1:[function(e,t){"use strict";function s(e,t){for(var s={},i=0,n=e.length;n>i;i++)t?s[e[i][t]]=!0:s[e[i]]=!0;return s}function i(e,t,i){for(var n=[],l=0,o=s(i),r=0,p=e.length,a=i.length;p>r&&a>l;r++)o[e[r][t]]&&(n.push(e[r]),l++);return n}var n="undefined"!=typeof window?window.React:"undefined"!=typeof global?global.React:null,l=n.createClass({displayName:"FilteredMultiSelect",propTypes:{buttonText:n.PropTypes.string,className:n.PropTypes.string,classNames:n.PropTypes.object,defaultFilter:n.PropTypes.string,disabled:n.PropTypes.bool,onChange:n.PropTypes.func.isRequired,options:n.PropTypes.array.isRequired,placeholder:n.PropTypes.string,selectedOptions:n.PropTypes.array,size:n.PropTypes.number,textProp:n.PropTypes.string,valueProp:n.PropTypes.string},getDefaultProps:function(){return{buttonText:"Select",className:"FilteredMultiSelect",classNames:{button:"FilteredMultiSelect__button",filter:"FilteredMultiSelect__filter",select:"FilteredMultiSelect__select"},defaultFilter:"",disabled:!1,placeholder:"type to filter",size:6,selectedOptions:[],textProp:"text",valueProp:"value"}},getInitialState:function(){return{filter:this.props.defaultFilter,filteredOptions:this.filterOptions(this.props.defaultFilter,this.props.selectedOptions),selectedOptions:this.props.selectedOptions.slice(),selectedValues:[]}},componentWillReceiveProps:function(e){e.selectedOptions.length!=this.state.selectedOptions.length&&this.setState({filteredOptions:this.filterOptions(this.state.filter,e.selectedOptions),selectedOptions:e.selectedOptions.slice()})},filterOptions:function(e,t){"undefined"==typeof e&&(e=this.state.filter),"undefined"==typeof t&&(t=this.state.selectedOptions),e=e.toUpperCase();for(var i=this.props.options,n=this.props.textProp,l=this.props.valueProp,o=s(t,l),r=[],p=0,a=i.length;a>p;p++)o[i[p][l]]||e&&-1==i[p][n].toUpperCase().indexOf(e)||r.push(i[p]);return r},onFilterChange:function(e){var t=e.target.value;this.setState({filter:t,filteredOptions:this.filterOptions(t)})},onFilterKeyPress:function(e){if("Enter"==e.key&&(e.preventDefault(),1==this.state.filteredOptions.length)){var t=this.state.filteredOptions[0],s=this.state.selectedOptions.slice().concat([t]);this.setState({filter:"",filteredOptions:this.filterOptions("",s),selectedOptions:s},this.props.onChange.bind(null,s))}},onSelectChange:function(e){for(var t=e.target,s=[],i=0,n=t.options.length;n>i;i++)t.options[i].selected&&s.push(t.options[i].value);this.setState({selectedValues:s})},selectOptions:function(){var e=this.state.selectedOptions.concat(i(this.state.filteredOptions,this.props.valueProp,this.state.selectedValues));this.setState({filteredOptions:this.filterOptions(this.state.filter,e),selectedOptions:e,selectedValues:[]},this.props.onChange.bind(null,e))},render:function(){var e=this.props,t=this.state;return n.createElement("div",{className:e.className},n.createElement("input",{type:"text",className:e.classNames.filter,placeholder:e.placeholder,value:t.filter,onChange:this.onFilterChange,onKeyPress:this.onFilterKeyPress,disabled:e.disabled}),n.createElement("select",{multiple:!0,className:e.classNames.select,size:e.size,value:t.selectedValues,onChange:this.onSelectChange,disabled:e.disabled},this.state.filteredOptions.map(function(t){return n.createElement("option",{key:t[e.valueProp],value:t[e.valueProp]},t[e.textProp])})),n.createElement("button",{type:"button",className:e.classNames.button,disabled:0===t.selectedValues.length,onClick:this.selectOptions},this.props.buttonText))}});t.exports=l},{}]},{},[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;"undefined"!=typeof window?t=window:"undefined"!=typeof global?t=global:"undefined"!=typeof self&&(t=self),t.FilteredMultiSelect=e()}}(function(){return function e(t,s,i){function n(l,r){if(!s[l]){if(!t[l]){var p="function"==typeof require&&require;if(!r&&p)return p(l,!0);if(o)return o(l,!0);var a=new Error("Cannot find module '"+l+"'");throw a.code="MODULE_NOT_FOUND",a}var u=s[l]={exports:{}};t[l][0].call(u.exports,function(e){var s=t[l][1][e];return n(s?s:e)},u,u.exports,e,t,s,i)}return s[l].exports}for(var o="function"==typeof require&&require,l=0;l<i.length;l++)n(i[l]);return n}({1:[function(e,t){"use strict";function s(e,t){for(var s={},i=0,n=e.length;n>i;i++)t?s[e[i][t]]=!0:s[e[i]]=!0;return s}function i(e,t,i){for(var n=[],o=0,l=s(i),r=0,p=e.length,a=i.length;p>r&&a>o;r++)l[e[r][t]]&&(n.push(e[r]),o++);return n}var n="undefined"!=typeof window?window.React:"undefined"!=typeof global?global.React:null,o=n.createClass({displayName:"FilteredMultiSelect",propTypes:{buttonText:n.PropTypes.string,className:n.PropTypes.string,classNames:n.PropTypes.object,defaultFilter:n.PropTypes.string,disabled:n.PropTypes.bool,onChange:n.PropTypes.func.isRequired,options:n.PropTypes.array.isRequired,placeholder:n.PropTypes.string,selectedOptions:n.PropTypes.array,size:n.PropTypes.number,textProp:n.PropTypes.string,valueProp:n.PropTypes.string},getDefaultProps:function(){return{buttonText:"Select",className:"FilteredMultiSelect",classNames:{button:"FilteredMultiSelect__button",filter:"FilteredMultiSelect__filter",select:"FilteredMultiSelect__select"},defaultFilter:"",disabled:!1,placeholder:"type to filter",size:6,selectedOptions:[],textProp:"text",valueProp:"value"}},getInitialState:function(){var e=this.props,t=e.defaultFilter,s=e.selectedOptions;return{filter:t,filteredOptions:this._filterOptions(t,s),selectedValues:[]}},componentWillReceiveProps:function(e){(e.options!==this.props.options||e.selectedOptions!==this.props.selectedOptions||e.options.length!=this.props.options.length||e.selectedOptions.length!=this.props.selectedOptions.length)&&this.setState({filteredOptions:this._filterOptions(this.state.filter,e.selectedOptions,e.options)},this._updateSelectedValues)},_filterOptions:function(e,t,i){"undefined"==typeof e&&(e=this.state.filter),"undefined"==typeof t&&(t=this.props.selectedOptions),"undefined"==typeof i&&(i=this.props.options),e=e.toUpperCase();for(var n=this.props,o=n.textProp,l=n.valueProp,r=s(t,l),p=[],a=0,u=i.length;u>a;a++)r[i[a][l]]||e&&-1==i[a][o].toUpperCase().indexOf(e)||p.push(i[a]);return p},_onFilterChange:function(e){var t=e.target.value;this.setState({filter:t,filteredOptions:this._filterOptions(t)},this._updateSelectedValues)},_onFilterKeyPress:function(e){if("Enter"==e.key&&(e.preventDefault(),1==this.state.filteredOptions.length)){var t=this.state.filteredOptions[0],s=this.props.selectedOptions.concat([t]);this.setState({filter:"",selectedValues:[]},function(){this.props.onChange(s)}.bind(this))}},_updateSelectedValues:function(e){for(var t=e?e.target:this.refs.select.getDOMNode(),s=[],i=0,n=t.options.length;n>i;i++)t.options[i].selected&&s.push(t.options[i].value);(e||String(this.state.selectedValues)!=String(s))&&this.setState({selectedValues:s})},_onButtonClick:function(){var e=this.props.selectedOptions.concat(i(this.state.filteredOptions,this.props.valueProp,this.state.selectedValues));this.setState({selectedValues:[]},function(){this.props.onChange(e)}.bind(this))},render:function(){var e=this,t=e.props,s=e.state;return n.createElement("div",{className:t.className},n.createElement("input",{type:"text",className:t.classNames.filter,placeholder:t.placeholder,value:s.filter,onChange:this._onFilterChange,onKeyPress:this._onFilterKeyPress,disabled:t.disabled}),n.createElement("select",{multiple:!0,ref:"select",className:t.classNames.select,size:t.size,value:s.selectedValues,onChange:this._updateSelectedValues,disabled:t.disabled},this.state.filteredOptions.map(function(e){return n.createElement("option",{key:e[t.valueProp],value:e[t.valueProp]},e[t.textProp])})),n.createElement("button",{type:"button",className:t.classNames.button,disabled:0===s.selectedValues.length,onClick:this._onButtonClick},this.props.buttonText))}});t.exports=o},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/package.json b/package.json
index a4d1dd2..5825516 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-filtered-multiselect",
   "description": "Filtered multi-select React component",
-  "version": "0.2.0-alpha",
+  "version": "0.2.0",
   "author": "Jonny Buchanan <jonathan.buchanan@gmail.com> (https://github.com/insin)",
   "keywords": [
     "react",