diff --git a/.gitignore b/.gitignore
index c95a69547..c62d40158 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ dist/
 .idea
 *.orig
 lib/
+# No yarn.lock for libs
+yarn.lock
diff --git a/demo/build.js b/demo/build.js
index c4b2a670c..282ff573b 100644
--- a/demo/build.js
+++ b/demo/build.js
@@ -4,7 +4,7 @@ var UglifyJsPlugin      = webpack.optimize.UglifyJsPlugin;
 var path                = require('path');
 var DefinePlugin        = webpack.DefinePlugin;
 var WebpackDevServer    = require("webpack-dev-server");
-var NODE_ENV            = process.env.NODE_ENV.trim() || 'production';
+var NODE_ENV            = process.env.NODE_ENV && process.env.NODE_ENV.trim() || 'production';
 
 var config = {
   entry                 : {
diff --git a/src/DateRange.js b/src/DateRange.js
index 0e0fddba0..99c558c30 100644
--- a/src/DateRange.js
+++ b/src/DateRange.js
@@ -13,8 +13,13 @@ class DateRange extends Component {
 
     const { format, linkedCalendars, theme } = props;
 
-    const startDate = parseInput(props.startDate, format, 'startOf');
-    const endDate   = parseInput(props.endDate, format, 'endOf');
+    let startDate = parseInput(props.startDate, format, 'startOf');
+    let endDate   = parseInput(props.endDate, format, 'endOf');
+    // Allows to select no date at all.
+    if (props.startDate === null && props.endDate === null) {
+      startDate = null;
+      endDate = null;
+    }
 
     this.state = {
       range     : { startDate, endDate },
@@ -32,7 +37,7 @@ class DateRange extends Component {
 
   orderRange(range) {
     const { startDate, endDate } = range;
-    const swap = startDate.isAfter(endDate);
+    const swap = startDate !== null && startDate.isAfter(endDate);
 
     if (!swap) return range;
 
@@ -89,6 +94,11 @@ class DateRange extends Component {
   }
 
   componentWillReceiveProps(newProps) {
+    // Allows to select no date at all.
+    // TODO Trigger onChange() through setRange()?
+    if (newProps.startDate === null && newProps.endDate === null) {
+      this.setState({ range: { startDate: null, endDate: null } });
+    }
     // Whenever date props changes, update state with parsed variant
     if (newProps.startDate || newProps.endDate) {
       const format       = newProps.format || this.props.format;
diff --git a/src/LangDic.js b/src/LangDic.js
index 2ffa3f604..1e4668edc 100644
--- a/src/LangDic.js
+++ b/src/LangDic.js
@@ -124,7 +124,7 @@ export default {
     'th':'목',
     'fr':'금',
     'sa':'토'
-  }
+  },
   'es' : { // Spanish
     'january':'Enero',
     'february':'Febrero',