diff --git a/dist/react-pikaday-component.js b/dist/react-pikaday-component.js
index 51b591e..5a314ab 100644
--- a/dist/react-pikaday-component.js
+++ b/dist/react-pikaday-component.js
@@ -52,7 +52,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ function(module, exports, __webpack_require__) {
+/***/ (function(module, exports, __webpack_require__) {
 
 	'use strict';
 
@@ -107,9 +107,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	            var newDate = this._getValueLink(nextProps).value;
 	            var lastDate = this._getValueLink(this.props).value;
 
-	            this._setDateIfChanged(newDate, lastDate);
 	            this._setMinDateIfChanged(nextProps.minDate, this.props.minDate);
 	            this._setMaxDateIfChanged(nextProps.maxDate, this.props.maxDate);
+	            this._setDateIfChanged(newDate, lastDate);
 	        }
 	    }, {
 	        key: 'componentDidUpdate',
@@ -134,18 +134,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	        value: function render() {
 	            var _props = this.props,
 	                id = _props.id,
+	                type = _props.type,
 	                className = _props.className,
 	                name = _props.name,
 	                tabIndex = _props.tabIndex,
 	                disabled = _props.disabled,
 	                placeholder = _props.placeholder,
 	                readOnly = _props.readOnly,
-	                style = _props.style;
+	                style = _props.style,
+	                _onChange = _props.onChange;
 
 
 	            return _react2.default.createElement('input', {
 	                id: id,
-	                type: 'text',
+	                type: type,
 	                ref: 'pikaday',
 	                name: name,
 	                className: className,
@@ -153,7 +155,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	                placeholder: placeholder,
 	                disabled: disabled,
 	                readOnly: readOnly,
-	                tabIndex: tabIndex
+	                tabIndex: tabIndex,
+	                onChange: function onChange(e) {
+	                    return e.target.value === '' ? _onChange(undefined) : null;
+	                }
 	            });
 	        }
 	    }, {
@@ -235,6 +240,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	ReactPikadayComponent.propTypes = {
 	    id: _react.PropTypes.string,
+	    type: _react.PropTypes.string,
 	    value: _react.PropTypes.instanceOf(Date),
 	    onChange: _react.PropTypes.func,
 	    disabled: _react.PropTypes.bool,
@@ -251,22 +257,25 @@ return /******/ (function(modules) { // webpackBootstrap
 	    // see Pikaday options at https://github.com/dbushell/Pikaday#configuration
 	    // except `onSelect` and `field`
 	};
+	ReactPikadayComponent.defaultProps = {
+	    type: 'text'
+	};
 	exports.default = ReactPikadayComponent;
 	module.exports = exports['default'];
 
-/***/ },
+/***/ }),
 /* 1 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	module.exports = __WEBPACK_EXTERNAL_MODULE_1__;
 
-/***/ },
+/***/ }),
 /* 2 */
-/***/ function(module, exports) {
+/***/ (function(module, exports) {
 
 	module.exports = __WEBPACK_EXTERNAL_MODULE_2__;
 
-/***/ }
+/***/ })
 /******/ ])
 });
 ;
\ No newline at end of file
diff --git a/dist/react-pikaday-component.min.js b/dist/react-pikaday-component.min.js
index f990a5f..03c1504 100644
--- a/dist/react-pikaday-component.min.js
+++ b/dist/react-pikaday-component.min.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("pikaday"),require("react")):"function"==typeof define&&define.amd?define("ReactPikadayComponent",["pikaday","react"],t):"object"==typeof exports?exports.ReactPikadayComponent=t(require("pikaday"),require("react")):e.ReactPikadayComponent=t(e.Pikaday,e.React)}(this,function(e,t){return function(e){function t(a){if(n[a])return n[a].exports;var o=n[a]={exports:{},id:a,loaded:!1};return e[a].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function o(e,t){var n={};for(var a in e)t.indexOf(a)>=0||Object.prototype.hasOwnProperty.call(e,a)&&(n[a]=e[a]);return n}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(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(t,"__esModule",{value:!0});var p=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(e[a]=n[a])}return e},u=function(){function e(e,t){for(var n=0;n<t.length;n++){var a=t[n];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),l=n(2),f=a(l),c=void 0;"undefined"!=typeof window&&(c=n(1));var d=function(e){function t(){return r(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return s(t,e),u(t,[{key:"componentDidMount",value:function(){var e=this._getValueLink(this.props),t=e.value;this._setupPikaday(),this._setDateIfChanged(t)}},{key:"componentWillReceiveProps",value:function(e){var t=this._getValueLink(e).value,n=this._getValueLink(this.props).value;this._setDateIfChanged(t,n),this._setMinDateIfChanged(e.minDate,this.props.minDate),this._setMaxDateIfChanged(e.maxDate,this.props.maxDate)}},{key:"componentDidUpdate",value:function(e){if(!e.container&&this.props.container){var t=this._getValueLink(this.props).value,n=this._getValueLink(e).value;this.pikaday.destroy(),this._setupPikaday(),this._setDateIfChanged(t,n)}}},{key:"componentWillUnmount",value:function(){this.pikaday.destroy()}},{key:"render",value:function(){var e=this.props,t=e.id,n=e.type,a=e.className,o=e.name,r=e.tabIndex,i=e.disabled,s=e.placeholder,p=e.readOnly,u=e.style;return f.default.createElement("input",{id:t,type:n,ref:"pikaday",name:o,className:a,style:u,placeholder:s,disabled:i,readOnly:p,tabIndex:r})}},{key:"_getValueLink",value:function(e){return e.valueLink||{value:e.value,requestChange:e.onChange}}},{key:"_setupPikaday",value:function(){var e=this.refs.pikaday,t=this._getValueLink(this.props),n=t.requestChange,a=this.props,r=(a.value,a.onChange,a.valueLink,o(a,["value","onChange","valueLink"])),i=p({},r,{field:e,onSelect:n});this.pikaday=new c(i)}},{key:"_setDateIfChanged",value:function(e,t){var n=this;this._setDate(e,t,function(t){if(isNaN(t)){var a=n.refs.pikaday;a.value=""}n.pikaday.setDate(e,!0)})}},{key:"_setMinDateIfChanged",value:function(e,t){var n=this;this._setDate(e,t,function(){n.pikaday.setMinDate(e)})}},{key:"_setMaxDateIfChanged",value:function(e,t){var n=this;this._setDate(e,t,function(){n.pikaday.setMaxDate(e)})}},{key:"_setDate",value:function(e,t,n){var a=e?e.getTime():null,o=t?t.getTime():null;a!==o&&n(a)}}]),t}(f.default.Component);d.propTypes={id:l.PropTypes.string,type:l.PropTypes.string,value:l.PropTypes.instanceOf(Date),onChange:l.PropTypes.func,disabled:l.PropTypes.bool,placeholder:l.PropTypes.string,readOnly:l.PropTypes.bool,name:l.PropTypes.string,style:l.PropTypes.object,tabIndex:l.PropTypes.number,valueLink:l.PropTypes.shape({value:l.PropTypes.instanceOf(Date),requestChange:l.PropTypes.func.isRequired})},d.defaultProps={type:"text"},t.default=d,e.exports=t.default},function(t,n){t.exports=e},function(e,n){e.exports=t}])});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("pikaday"),require("react")):"function"==typeof define&&define.amd?define("ReactPikadayComponent",["pikaday","react"],t):"object"==typeof exports?exports.ReactPikadayComponent=t(require("pikaday"),require("react")):e.ReactPikadayComponent=t(e.Pikaday,e.React)}(this,function(e,t){return function(e){function t(a){if(n[a])return n[a].exports;var o=n[a]={exports:{},id:a,loaded:!1};return e[a].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function a(e){return e&&e.__esModule?e:{default:e}}function o(e,t){var n={};for(var a in e)t.indexOf(a)>=0||Object.prototype.hasOwnProperty.call(e,a)&&(n[a]=e[a]);return n}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function s(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(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var a in n)Object.prototype.hasOwnProperty.call(n,a)&&(e[a]=n[a])}return e},p=function(){function e(e,t){for(var n=0;n<t.length;n++){var a=t[n];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(t,n,a){return n&&e(t.prototype,n),a&&e(t,a),t}}(),l=n(2),f=a(l),c=void 0;"undefined"!=typeof window&&(c=n(1));var d=function(e){function t(){return r(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return s(t,e),p(t,[{key:"componentDidMount",value:function(){var e=this._getValueLink(this.props),t=e.value;this._setupPikaday(),this._setDateIfChanged(t)}},{key:"componentWillReceiveProps",value:function(e){var t=this._getValueLink(e).value,n=this._getValueLink(this.props).value;this._setMinDateIfChanged(e.minDate,this.props.minDate),this._setMaxDateIfChanged(e.maxDate,this.props.maxDate),this._setDateIfChanged(t,n)}},{key:"componentDidUpdate",value:function(e){if(!e.container&&this.props.container){var t=this._getValueLink(this.props).value,n=this._getValueLink(e).value;this.pikaday.destroy(),this._setupPikaday(),this._setDateIfChanged(t,n)}}},{key:"componentWillUnmount",value:function(){this.pikaday.destroy()}},{key:"render",value:function(){var e=this.props,t=e.id,n=e.type,a=e.className,o=e.name,r=e.tabIndex,i=e.disabled,s=e.placeholder,u=e.readOnly,p=e.style,l=e.onChange;return f.default.createElement("input",{id:t,type:n,ref:"pikaday",name:o,className:a,style:p,placeholder:s,disabled:i,readOnly:u,tabIndex:r,onChange:function(e){return""===e.target.value?l(void 0):null}})}},{key:"_getValueLink",value:function(e){return e.valueLink||{value:e.value,requestChange:e.onChange}}},{key:"_setupPikaday",value:function(){var e=this.refs.pikaday,t=this._getValueLink(this.props),n=t.requestChange,a=this.props,r=(a.value,a.onChange,a.valueLink,o(a,["value","onChange","valueLink"])),i=u({},r,{field:e,onSelect:n});this.pikaday=new c(i)}},{key:"_setDateIfChanged",value:function(e,t){var n=this;this._setDate(e,t,function(t){if(isNaN(t)){var a=n.refs.pikaday;a.value=""}n.pikaday.setDate(e,!0)})}},{key:"_setMinDateIfChanged",value:function(e,t){var n=this;this._setDate(e,t,function(){n.pikaday.setMinDate(e)})}},{key:"_setMaxDateIfChanged",value:function(e,t){var n=this;this._setDate(e,t,function(){n.pikaday.setMaxDate(e)})}},{key:"_setDate",value:function(e,t,n){var a=e?e.getTime():null,o=t?t.getTime():null;a!==o&&n(a)}}]),t}(f.default.Component);d.propTypes={id:l.PropTypes.string,type:l.PropTypes.string,value:l.PropTypes.instanceOf(Date),onChange:l.PropTypes.func,disabled:l.PropTypes.bool,placeholder:l.PropTypes.string,readOnly:l.PropTypes.bool,name:l.PropTypes.string,style:l.PropTypes.object,tabIndex:l.PropTypes.number,valueLink:l.PropTypes.shape({value:l.PropTypes.instanceOf(Date),requestChange:l.PropTypes.func.isRequired})},d.defaultProps={type:"text"},t.default=d,e.exports=t.default},function(t,n){t.exports=e},function(e,n){e.exports=t}])});
\ No newline at end of file
diff --git a/index.js b/index.js
index 2429137..35a6282 100644
--- a/index.js
+++ b/index.js
@@ -51,9 +51,9 @@ var ReactPikadayComponent = function (_React$Component) {
             var newDate = this._getValueLink(nextProps).value;
             var lastDate = this._getValueLink(this.props).value;
 
-            this._setDateIfChanged(newDate, lastDate);
             this._setMinDateIfChanged(nextProps.minDate, this.props.minDate);
             this._setMaxDateIfChanged(nextProps.maxDate, this.props.maxDate);
+            this._setDateIfChanged(newDate, lastDate);
         }
     }, {
         key: 'componentDidUpdate',
@@ -85,7 +85,8 @@ var ReactPikadayComponent = function (_React$Component) {
                 disabled = _props.disabled,
                 placeholder = _props.placeholder,
                 readOnly = _props.readOnly,
-                style = _props.style;
+                style = _props.style,
+                _onChange = _props.onChange;
 
 
             return _react2.default.createElement('input', {
@@ -98,7 +99,10 @@ var ReactPikadayComponent = function (_React$Component) {
                 placeholder: placeholder,
                 disabled: disabled,
                 readOnly: readOnly,
-                tabIndex: tabIndex
+                tabIndex: tabIndex,
+                onChange: function onChange(e) {
+                    return e.target.value === '' ? _onChange(undefined) : null;
+                }
             });
         }
     }, {
diff --git a/src/ReactPikadayComponent.js b/src/ReactPikadayComponent.js
index c4fdb95..b25a405 100644
--- a/src/ReactPikadayComponent.js
+++ b/src/ReactPikadayComponent.js
@@ -41,9 +41,9 @@ class ReactPikadayComponent extends React.Component {
         const newDate = this._getValueLink(nextProps).value;
         const lastDate = this._getValueLink(this.props).value;
 
-        this._setDateIfChanged(newDate, lastDate);
         this._setMinDateIfChanged(nextProps.minDate, this.props.minDate);
         this._setMaxDateIfChanged(nextProps.maxDate, this.props.maxDate);
+        this._setDateIfChanged(newDate, lastDate);
     }
 
     componentDidUpdate(prevProps) {
@@ -63,7 +63,7 @@ class ReactPikadayComponent extends React.Component {
     }
 
     render() {
-        const { id, type, className, name, tabIndex, disabled, placeholder, readOnly, style } = this.props;
+        const { id, type, className, name, tabIndex, disabled, placeholder, readOnly, style, onChange } = this.props;
 
         return (
             <input
@@ -77,6 +77,7 @@ class ReactPikadayComponent extends React.Component {
                 disabled={disabled}
                 readOnly={readOnly}
                 tabIndex={tabIndex}
+                onChange={(e) => (e.target.value === '' ? onChange(undefined) : null)}
             />
         );
     }