diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
index 6abf38f94..056c76dd6 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
@@ -6,17 +6,17 @@ function test_cases() {
     $('#datetimepicker').datetimepicker({
         pickDate: false
     });
-	$('#datetimepicker').datetimepicker({
+    $('#datetimepicker').datetimepicker({
         pickTime: false
     });
-	$('#datetimepicker').datetimepicker({
+    $('#datetimepicker').datetimepicker({
         minDate: '2012-12-31'
     });
-	
-	$('#datetimepicker').data("DateTimePicker").setMaxDate('2012-12-31');
-	
-	var startDate = new Date(2012, 1, 20);
-    var endDate = new Date(2012, 1, 25);
+
+    $('#datetimepicker').data("DateTimePicker").setMaxDate('2012-12-31');
+
+    var startDate = moment(new Date(2012, 1, 20));
+    var endDate = moment(new Date(2012, 1, 25));
     $('#datetimepicker2')
         .datetimepicker()
         .on("dp.change", function (ev) {
diff --git a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
index 228b7537f..0db3f7b3f 100644
--- a/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
+++ b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker.d.ts
@@ -10,15 +10,22 @@
  */
 
 /// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="../moment/moment.d.ts"/>
 
 declare module BootstrapV3DatetimePicker {
-    interface DatetimepickerChangeEventObject extends JQueryEventObject {
-        date: any;
-        oldDate: any;
+    enum ViewMode {
+        'days',
+        'months',
+        'years',
+        'decades'
+    }
+
+    interface DatetimepickerChangeEventObject extends DatetimepickerEventObject {
+        oldDate: moment.Moment;
     }
 
     interface DatetimepickerEventObject extends JQueryEventObject {
-        date: any;
+        date: moment.Moment;
     }
 
     interface DatetimepickerIcons {
@@ -35,33 +42,37 @@ declare module BootstrapV3DatetimePicker {
         useSeconds?: boolean;
         useCurrent?: boolean;
         minuteStepping?: number;
-        minDate?: any;
-        maxDate?: any;
+        minDate?: moment.Moment | Date | string;
+        maxDate?: moment.Moment | Date | string;
         showToday?: boolean;
         collapse?: boolean;
         language?: string;
-        defaultDate?: string;
-        disabledDates?: Array<any>;
-        enabledDates?: Array<any>;
+        defaultDate?: moment.Moment | Date | string;
+        disabledDates?: Array<moment.Moment | Date | string>;
+        enabledDates?: Array<moment.Moment | Date | string>;
         icons?: DatetimepickerIcons;
         useStrict?: boolean;
         direction?: string;
         sideBySide?: boolean;
-        daysOfWeekDisabled?: Array<any>;
+        daysOfWeekDisabled?: Array<number>;
         calendarWeeks?: boolean;
         format?: string | boolean;
         locale?: string;
         showTodayButton?: boolean;
+        viewMode?: string;
+        inline?: boolean;
     }
 
     interface Datetimepicker {
-        setDate(date: any): void;
-        setMinDate(date: any): void;
-        setMaxDate(date: any): void;
+        date(date: moment.Moment | Date | string): void;
+        date(): moment.Moment;
+        minDate(date: moment.Moment | Date | string): void;
+        minDate(): moment.Moment | boolean;
+        maxDate(date: moment.Moment | Date | string): void;
+        maxDate(): moment.Moment | boolean;
         show(): void;
         disable(): void;
         enable(): void;
-        getDate(): void;
     }
 
 }