diff --git a/.gitignore b/.gitignore
index 986ea28..0e62170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /bower_components
 .sass-cache
 *.map
+.idea
diff --git a/build/angular-mighty-datepicker.css b/build/angular-mighty-datepicker.css
index a2d856b..24bcce0 100644
--- a/build/angular-mighty-datepicker.css
+++ b/build/angular-mighty-datepicker.css
@@ -33,6 +33,10 @@
   color: #3b5;
   font-weight: bold;
 }
+.mighty-picker-calendar__day--selected-to {
+  color: orange;
+  font-weight: bold;
+}
 .mighty-picker__month {
   display: inline-block;
   margin: 0 6px;
diff --git a/build/angular-mighty-datepicker.js b/build/angular-mighty-datepicker.js
index 47616d0..ba6a96e 100644
--- a/build/angular-mighty-datepicker.js
+++ b/build/angular-mighty-datepicker.js
@@ -4,7 +4,7 @@
   angular.module("mightyDatepicker").directive("mightyDatepicker", [
     "$compile", function($compile) {
       var options, pickerTemplate;
-      pickerTemplate = "<div class=\"mighty-picker__wrapper\">\n  <button type=\"button\" class=\"mighty-picker__prev-month\"\n    ng-click=\"moveMonth(-1)\">\n    <<\n  </button>\n  <div class=\"mighty-picker__month\"\n    bindonce ng-repeat=\"month in months track by $index\">\n    <div class=\"mighty-picker__month-name\" ng-bind=\"month.name\"></div>\n    <table class=\"mighty-picker-calendar\">\n      <tr class=\"mighty-picker-calendar__days\">\n        <th bindonce ng-repeat=\"day in month.weeks[1]\"\n          class=\"mighty-picker-calendar__weekday\"\n          bo-text=\"day.date.format('dd')\">\n        </th>\n      </tr>\n      <tr bindonce ng-repeat=\"week in month.weeks\">\n        <td\n            bo-class='{\n              \"mighty-picker-calendar__day\": day,\n              \"mighty-picker-calendar__day--selected\": day.selected,\n              \"mighty-picker-calendar__day--disabled\": day.disabled,\n              \"mighty-picker-calendar__day--in-range\": day.inRange,\n              \"mighty-picker-calendar__day--marked\": day.marker\n            }'\n            ng-repeat=\"day in week track by $index\" ng-click=\"select(day)\">\n            <div class=\"mighty-picker-calendar__day-wrapper\"\n              bo-text=\"day.date.date()\"></div>\n            <div class=\"mighty-picker-calendar__day-marker-wrapper\">\n              <div class=\"mighty-picker-calendar__day-marker\"\n                ng-if=\"day.marker\"\n                ng-bind-template=\"\">\n              </div>\n            </div>\n        </td>\n      </tr>\n    </table>\n  </div>\n  <button type=\"button\" class=\"mighty-picker__next-month\"\n    ng-click=\"moveMonth(1)\">\n    >>\n  </button>\n</div>";
+      pickerTemplate = "<div class=\"mighty-picker__wrapper\">\n  <button type=\"button\" class=\"mighty-picker__prev-month\"\n    ng-click=\"moveMonth(-1)\">\n    <<\n  </button>\n  <div class=\"mighty-picker__month\"\n    bindonce ng-repeat=\"month in months track by $index\">\n    <div class=\"mighty-picker__month-name\" ng-bind=\"month.name\"></div>\n    <table class=\"mighty-picker-calendar\">\n      <tr class=\"mighty-picker-calendar__days\">\n        <th bindonce ng-repeat=\"day in month.weeks[1]\"\n          class=\"mighty-picker-calendar__weekday\"\n          bo-text=\"day.date.format('dd')\">\n        </th>\n      </tr>\n      <tr bindonce ng-repeat=\"week in month.weeks\">\n        <td\n            bo-class='{\n              \"mighty-picker-calendar__day\": day,\n              \"mighty-picker-calendar__day--selected\": day.selected,\n              \"mighty-picker-calendar__day--selected-to\": day.selectedTo,\n              \"mighty-picker-calendar__day--disabled\": day.disabled,\n              \"mighty-picker-calendar__day--in-range\": day.inRange,\n              \"mighty-picker-calendar__day--marked\": day.marker\n            }'\n            ng-repeat=\"day in week track by $index\" ng-click=\"select(day)\">\n            <div class=\"mighty-picker-calendar__day-wrapper\"\n              bo-text=\"day.date.date()\"></div>\n            <div class=\"mighty-picker-calendar__day-marker-wrapper\">\n              <div class=\"mighty-picker-calendar__day-marker\"\n                ng-if=\"day.marker\"\n                ng-bind-template=\"\">\n              </div>\n            </div>\n        </td>\n      </tr>\n    </table>\n  </div>\n  <button type=\"button\" class=\"mighty-picker__next-month\"\n    ng-click=\"moveMonth(1)\">\n    >>\n  </button>\n</div>";
       options = {
         mode: "simple",
         months: 1,
@@ -28,7 +28,7 @@
           rangeTo: '='
         },
         link: function($scope, $element, $attrs) {
-          var _bake, _build, _buildMonth, _buildWeek, _getMarker, _indexMarkers, _indexOfMoment, _isInRange, _isSelected, _prepare, _setup, _withinLimits;
+          var _bake, _build, _buildMonth, _buildWeek, _getMarker, _indexMarkers, _indexOfMoment, _isInRange, _isSelected, _isSelectedTo, _prepare, _setup, _withinLimits;
           _bake = function() {
             var domEl;
             domEl = $compile(angular.element($scope.options.template))($scope);
@@ -83,19 +83,45 @@
             switch ($scope.options.mode) {
               case "multiple":
                 return _indexOfMoment($scope.model, day, 'day') > -1;
+              case "range":
+                if ($scope.model) {
+                  return day.isSame($scope.model.start, 'day');
+                }
+                break;
               default:
                 return $scope.model && day.isSame($scope.model, 'day');
             }
           };
+          _isSelectedTo = function(day) {
+            switch ($scope.options.mode) {
+              case "range":
+                if ($scope.model) {
+                  return day.isSame($scope.model.end, 'day');
+                }
+                break;
+              default:
+                return false;
+            }
+          };
           _isInRange = function(day) {
-            if ($scope.options.rangeMode) {
-              if ($scope.options.rangeMode === "from") {
-                return moment.range($scope.model, $scope.before).contains(day) || day.isSame($scope.before, 'day');
-              } else {
-                return moment.range($scope.after, $scope.model).contains(day) || day.isSame($scope.after, 'day');
-              }
-            } else {
-              return false;
+            switch ($scope.options.mode) {
+              case "multiple":
+                if ($scope.options.rangeMode) {
+                  if ($scope.options.rangeMode === "from") {
+                    return moment.range($scope.model, $scope.before).contains(day) || day.isSame($scope.before, 'day');
+                  } else {
+                    return moment.range($scope.after, $scope.model).contains(day) || day.isSame($scope.after, 'day');
+                  }
+                } else {
+                  return false;
+                }
+                break;
+              case "range":
+                if ($scope.model.start) {
+                  return $scope.model.contains(day);
+                } else {
+                  return false;
+                }
             }
           };
           _buildWeek = function(time, month) {
@@ -114,6 +140,7 @@
               return {
                 date: day,
                 selected: _isSelected(day) && withinMonth,
+                selectedTo: _isSelectedTo(day) && withinMonth,
                 inRange: _isInRange(day),
                 disabled: !(withinLimits && withinMonth && filter),
                 marker: withinMonth ? _getMarker(day) : void 0
@@ -169,6 +196,15 @@
                   $scope.model = [];
                 }
                 break;
+              case "range":
+                if ($scope.model && $scope.model.start) {
+                  if ($scope.model.start.isValid()) {
+                    start = $scope.model.start;
+                  }
+                } else {
+                  $scope.model = moment.range();
+                }
+                break;
               default:
                 if ($scope.model) {
                   start = moment($scope.model);
@@ -204,7 +240,7 @@
             _prepare();
           };
           $scope.select = function(day) {
-            var ix;
+            var endValid, ix, startValid;
             if (!day.disabled) {
               switch ($scope.options.mode) {
                 case "multiple":
@@ -215,6 +251,19 @@
                     $scope.model.push(moment(day.date));
                   }
                   break;
+                case "range":
+                  startValid = $scope.model.start.isValid();
+                  endValid = $scope.model.end.isValid();
+                  if ((startValid && endValid) || (!startValid && !endValid)) {
+                    $scope.model = moment.range(moment(day.date), moment(null));
+                  } else if (startValid && !endValid) {
+                    if (moment(day.date).isBefore($scope.model.start, 'day') || moment(day.date).isSame($scope.model.start, 'day')) {
+                      $scope.model.start = moment(day.date);
+                    } else {
+                      $scope.model.end = moment(day.date);
+                    }
+                  }
+                  break;
                 default:
                   $scope.model = day.date;
               }
@@ -236,6 +285,11 @@
                 return _prepare();
               });
               break;
+            case "range":
+              $scope.$watch('model', function(newVal, oldVal) {
+                return _prepare();
+              });
+              break;
             case "simple":
               $scope.$watch('model', function(newVal, oldVal) {
                 if (!moment.isMoment(newVal)) {
diff --git a/demo/index.html b/demo/index.html
index 950aac6..396bb7f 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -55,6 +55,9 @@
       $scope.dateDbB =  moment().add('day', 2);
       $scope.optionsDbB = {};
 
+      $scope.optionsR = {mode: "range"};
+      $scope.range = moment.range(moment().subtract('day', 8), moment().subtract('day', 2));
+
       $scope.addMarker = function() {
         $scope.markers.push({day: $scope.mark, marker: 'new marker'});
       }
@@ -101,6 +104,10 @@ <h1>Double datepicker for data range</h1>
       <mighty-datepicker ng-model="dateDbA" options="optionsDbA" before="dateDbB" range-from="true" style="display: inline-block"></mighty-datepicker>
       <mighty-datepicker ng-model="dateDbB" options="optionsDbB" after="dateDbA" range-to="true" style="display: inline-block"></mighty-datepicker>
     </div>
+    <div>
+      <h1>Single datepicker for date range</h1>
+      <mighty-datepicker ng-model="range" options="optionsR" range-from="true" style="display: inline-block"></mighty-datepicker>
+    </div>
   </div>
 </body>
 </html>
diff --git a/gulpfile.js b/gulpfile.js
index f3cfbd9..b8e1687 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,7 +15,7 @@ var warn = function(err) { console.warn(err); };
 var paths = {
   src: "./src/",
   dst: "./build/"
-}
+};
 
 var onError = function (err) {
   gutil.beep();
@@ -24,7 +24,7 @@ var onError = function (err) {
 
 gulp.task("default", ["bower", "build"]);
 
-gulp.task("build", ["coffee", "less"])
+gulp.task("build", ["coffee", "less"]);
 
 gulp.task("server", ["build", "watch"], function() {
   connect.server({
@@ -36,7 +36,7 @@ gulp.task("server", ["build", "watch"], function() {
 gulp.task("clean", function(){
   return gulp.src(paths.dst, {read: false})
     .pipe(clean());
-})
+});
 
 gulp.task("watch", function(){
   return gulp.watch(paths.src + "**/*", ["build"]);
diff --git a/src/angular-mighty-datepicker.coffee b/src/angular-mighty-datepicker.coffee
index 384b65d..2d44c7b 100644
--- a/src/angular-mighty-datepicker.coffee
+++ b/src/angular-mighty-datepicker.coffee
@@ -22,6 +22,7 @@ angular.module("mightyDatepicker").directive "mightyDatepicker", ["$compile", ($
                 bo-class='{
                   "mighty-picker-calendar__day": day,
                   "mighty-picker-calendar__day--selected": day.selected,
+                  "mighty-picker-calendar__day--selected-to": day.selectedTo,
                   "mighty-picker-calendar__day--disabled": day.disabled,
                   "mighty-picker-calendar__day--in-range": day.inRange,
                   "mighty-picker-calendar__day--marked": day.marker
@@ -95,17 +96,37 @@ angular.module("mightyDatepicker").directive "mightyDatepicker", ["$compile", ($
       switch $scope.options.mode
         when "multiple"
           return _indexOfMoment($scope.model, day, 'day') > -1
+        when "range"
+          if $scope.model
+            return day.isSame($scope.model.start, 'day')
         else
           return $scope.model && day.isSame($scope.model, 'day')
 
-    _isInRange = (day) ->
-      if $scope.options.rangeMode
-        if $scope.options.rangeMode == "from"
-          return moment.range($scope.model, $scope.before).contains(day) || day.isSame($scope.before, 'day')
+    _isSelectedTo = (day) ->
+      switch $scope.options.mode
+        when "range"
+          if $scope.model
+            return day.isSame($scope.model.end, 'day')
         else
-          return moment.range($scope.after, $scope.model).contains(day) || day.isSame($scope.after, 'day')
-      else
-        return false
+          return false
+
+    _isInRange = (day) ->
+      switch $scope.options.mode
+        when "multiple"
+          if $scope.options.rangeMode
+            if $scope.options.rangeMode == "from"
+              return moment.range($scope.model, $scope.before).contains(day) ||
+                  day.isSame($scope.before, 'day')
+            else
+              return moment.range($scope.after, $scope.model).contains(day) ||
+                  day.isSame($scope.after, 'day')
+          else
+            return false
+        when "range"
+          if $scope.model.start
+            return $scope.model.contains(day)
+          else
+            return false
 
     _buildWeek = (time, month) ->
       days = []
@@ -118,6 +139,7 @@ angular.module("mightyDatepicker").directive "mightyDatepicker", ["$compile", ($
         filter = $scope.options.filter(day) if $scope.options.filter
         date: day
         selected: _isSelected(day) && withinMonth
+        selectedTo: _isSelectedTo(day) && withinMonth
         inRange: _isInRange(day)
         disabled: !(withinLimits && withinMonth && filter)
         marker: _getMarker(day) if withinMonth
@@ -157,6 +179,14 @@ angular.module("mightyDatepicker").directive "mightyDatepicker", ["$compile", ($
               start = moment(dates.sort().slice(-1)[0])
           else
             $scope.model = []
+
+        when "range"
+          if $scope.model && $scope.model.start
+            if $scope.model.start.isValid()
+              start = $scope.model.start
+          else
+            $scope.model = moment.range()
+
         else
           start = moment($scope.model) if $scope.model
 
@@ -196,6 +226,26 @@ angular.module("mightyDatepicker").directive "mightyDatepicker", ["$compile", ($
               $scope.model.splice(ix, 1)
             else
               $scope.model.push(moment(day.date))
+
+          when "range"
+            startValid = $scope.model.start.isValid()
+            endValid = $scope.model.end.isValid()
+
+            # if the start date and end date are both valid or invalid
+            # reset the dates.
+            if (startValid && endValid) || (!startValid && !endValid)
+              $scope.model = moment.range(moment(day.date), moment(null))
+
+            # if the end date is invalid
+            # set the end date.
+            else if startValid && !endValid
+              # push back the start date if the selected day is before
+              if moment(day.date).isBefore($scope.model.start, 'day') ||
+                moment(day.date).isSame($scope.model.start, 'day')
+                  $scope.model.start = moment(day.date)
+              else
+                $scope.model.end = moment(day.date)
+
           else
             $scope.model = day.date
         $scope.options.callback day.date if $scope.options.callback
@@ -213,6 +263,10 @@ angular.module("mightyDatepicker").directive "mightyDatepicker", ["$compile", ($
         $scope.$watchCollection 'model', (newVals, oldVals) ->
           _prepare()
 
+      when "range"
+        $scope.$watch 'model', (newVal, oldVal) ->
+          _prepare()
+
       when "simple"
         $scope.$watch 'model', (newVal, oldVal) ->
           newVal = moment(newVal) unless moment.isMoment(newVal)
diff --git a/src/angular-mighty-datepicker.less b/src/angular-mighty-datepicker.less
index 6201268..4e44138 100644
--- a/src/angular-mighty-datepicker.less
+++ b/src/angular-mighty-datepicker.less
@@ -33,6 +33,10 @@
   color: #3b5;
   font-weight: bold;
 }
+.mighty-picker-calendar__day--selected-to {
+  color: orange;
+  font-weight: bold;
+}
 .mighty-picker__month {
   display: inline-block;
   margin: 0 6px;