diff --git a/Pickers/ActionSheetDatePicker.h b/Pickers/ActionSheetDatePicker.h
index 58619fab4..448ebdbe6 100755
--- a/Pickers/ActionSheetDatePicker.h
+++ b/Pickers/ActionSheetDatePicker.h
@@ -29,17 +29,24 @@
 
 @class ActionSheetDatePicker;
 
-typedef void(^ActionDateDoneBlock)(ActionSheetDatePicker *picker, NSDate *selectedDate, id origin);
+typedef void(^ActionDateDoneBlock)(ActionSheetDatePicker *picker, id selectedDate, id origin); //selectedDate is NSDate or NSNumber for "UIDatePickerModeCountDownTimer"
 typedef void(^ActionDateCancelBlock)(ActionSheetDatePicker *picker);
 
 @interface ActionSheetDatePicker : AbstractActionSheetPicker
 
-@property (nonatomic) NSDate *minimumDate;
-@property (nonatomic) NSDate *maximumDate;
-@property (nonatomic) NSInteger minuteInterval;
-@property (nonatomic) NSCalendar *calendar;
-@property (nonatomic) NSTimeZone *timeZone;
-@property (nonatomic) NSLocale *locale;
+@property (nonatomic, retain) NSDate *minimumDate; // specify min/max date range. default is nil. When min > max, the values are ignored. Ignored in countdown timer mode
+@property (nonatomic, retain) NSDate *maximumDate; // default is nil
+
+@property (nonatomic) NSInteger minuteInterval; // display minutes wheel with interval. interval must be evenly divided into 60. default is 1. min is 1, max is 30
+
+@property (nonatomic, retain) NSLocale   *locale;   // default is [NSLocale currentLocale]. setting nil returns to default
+@property (nonatomic, copy)   NSCalendar *calendar; // default is [NSCalendar currentCalendar]. setting nil returns to default
+@property (nonatomic, retain) NSTimeZone *timeZone; // default is nil. use current time zone or time zone from calendar
+
+@property (nonatomic, assign) NSTimeInterval countDownDuration; // for UIDatePickerModeCountDownTimer, ignored otherwise. default is 0.0. limit is 23:59 (86,399 seconds). value being set is div 60 (drops remaining seconds).
+
+@property (nonatomic, copy) ActionDateDoneBlock onActionSheetDone;
+@property (nonatomic, copy) ActionDateCancelBlock onActionSheetCancel;
 
 + (id)showPickerWithTitle:(NSString *)title datePickerMode:(UIDatePickerMode)datePickerMode selectedDate:(NSDate *)selectedDate target:(id)target action:(SEL)action origin:(id)origin;
 
@@ -54,6 +61,7 @@ typedef void(^ActionDateCancelBlock)(ActionSheetDatePicker *picker);
 
 - (id)initWithTitle:(NSString *)title datePickerMode:(UIDatePickerMode)datePickerMode selectedDate:(NSDate *)selectedDate target:(id)target action:(SEL)action origin:(id)origin cancelAction:(SEL)cancelAction;
 
+
 - (instancetype)initWithTitle:(NSString *)title
                datePickerMode:(UIDatePickerMode)datePickerMode
                  selectedDate:(NSDate *)selectedDate
@@ -63,7 +71,4 @@ typedef void(^ActionDateCancelBlock)(ActionSheetDatePicker *picker);
 
 - (void)eventForDatePicker:(id)sender;
 
-@property (nonatomic, copy) ActionDateDoneBlock onActionSheetDone;
-@property (nonatomic, copy) ActionDateCancelBlock onActionSheetCancel;
-
 @end
diff --git a/Pickers/ActionSheetDatePicker.m b/Pickers/ActionSheetDatePicker.m
index 51bdc5cc6..74700b22e 100755
--- a/Pickers/ActionSheetDatePicker.m
+++ b/Pickers/ActionSheetDatePicker.m
@@ -32,13 +32,9 @@
 @interface ActionSheetDatePicker()
 @property (nonatomic, assign) UIDatePickerMode datePickerMode;
 @property (nonatomic, strong) NSDate *selectedDate;
-@property (nonatomic, assign) NSTimeInterval duration;
 @end
 
 @implementation ActionSheetDatePicker
-@synthesize selectedDate = _selectedDate;
-@synthesize datePickerMode = _datePickerMode;
-@synthesize duration = _duration;
 
 + (id)showPickerWithTitle:(NSString *)title
            datePickerMode:(UIDatePickerMode)datePickerMode selectedDate:(NSDate *)selectedDate
@@ -79,7 +75,6 @@ - (id)initWithTitle:(NSString *)title datePickerMode:(UIDatePickerMode)datePicke
         self.title = title;
         self.datePickerMode = datePickerMode;
         self.selectedDate = selectedDate;
-        self.duration = 60;
     }
     return self;
 }
@@ -110,7 +105,14 @@ - (UIView *)configuredPickerView {
     datePicker.timeZone = self.timeZone;
     datePicker.locale = self.locale;
     
-    [datePicker setDate:self.selectedDate animated:NO];
+    // if datepicker is set with a date in countDownMode then
+    // 1h is added to the initial countdown
+    if (self.datePickerMode == UIDatePickerModeCountDownTimer) {
+        datePicker.countDownDuration = self.countDownDuration;
+    } else {
+        [datePicker setDate:self.selectedDate animated:NO];
+    }
+    
     [datePicker addTarget:self action:@selector(eventForDatePicker:) forControlEvents:UIControlEventValueChanged];
     
     //need to keep a reference to the picker so we can clear the DataSource / Delegate when dismissing (not used in this picker, but just in case somebody uses this as a template for another picker)
@@ -123,14 +125,19 @@ - (void)notifyTarget:(id)target didSucceedWithAction:(SEL)action origin:(id)orig
 {
     if (self.onActionSheetDone)
     {
-        self.onActionSheetDone(self, self.selectedDate, origin);
+        if (self.datePickerMode == UIDatePickerModeCountDownTimer)
+            self.onActionSheetDone(self, @(self.countDownDuration), origin);
+        else
+            self.onActionSheetDone(self, self.selectedDate, origin);
+
         return;
     }
     else if ([target respondsToSelector:action])
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
         if (self.datePickerMode == UIDatePickerModeCountDownTimer) {
-            [target performSelector:action withObject:@(self.duration) withObject:origin];
+            [target performSelector:action withObject:@(self.countDownDuration) withObject:origin];
+            
         } else {
             [target performSelector:action withObject:self.selectedDate withObject:origin];
         }
@@ -162,7 +169,7 @@ - (void)eventForDatePicker:(id)sender
         return;
     UIDatePicker *datePicker = (UIDatePicker *)sender;
     self.selectedDate = datePicker.date;
-    self.duration = datePicker.countDownDuration;
+    self.countDownDuration = datePicker.countDownDuration;
 }
 
 - (void)customButtonPressed:(id)sender {
diff --git a/Swift-Example/Swift-Example/Base.lproj/Main.storyboard b/Swift-Example/Swift-Example/Base.lproj/Main.storyboard
index 635f75ecc..f5d230c6b 100644
--- a/Swift-Example/Swift-Example/Base.lproj/Main.storyboard
+++ b/Swift-Example/Swift-Example/Base.lproj/Main.storyboard
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="14A386b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="FKR-yZ-MrN">
     <dependencies>
+        <deployment defaultVersion="1792" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
@@ -14,101 +15,172 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <sections>
-                            <tableViewSection id="Mbm-qD-1RO">
+                            <tableViewSection headerTitle="Main" id="Mbm-qD-1RO">
                                 <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="Xwu-EP-H8c">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="HwN-MG-62r">
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xwu-EP-H8c" id="w5q-y0-esj">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HwN-MG-62r" id="YBf-05-8DH">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p6F-Fu-Qq0">
-                                                    <rect key="frame" x="219" y="5" width="163" height="30"/>
-                                                    <state key="normal" title="UIDatePickerModeTime">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JEo-wc-8cF">
+                                                    <rect key="frame" x="234" y="5" width="132" height="30"/>
+                                                    <state key="normal" title="ActionLocalePicker">
                                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                                     </state>
                                                     <connections>
-                                                        <action selector="ActionSheetDatePickerClicked:" destination="HSJ-wC-erj" eventType="touchUpInside" id="aLQ-Vv-cOT"/>
+                                                        <action selector="localePickerClicked:" destination="HSJ-wC-erj" eventType="touchUpInside" id="rQI-SW-ueg"/>
                                                     </connections>
                                                 </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="centerY" secondItem="p6F-Fu-Qq0" secondAttribute="centerY" id="BeN-lj-kXR"/>
-                                                <constraint firstAttribute="centerX" secondItem="p6F-Fu-Qq0" secondAttribute="centerX" id="nui-H4-OsZ"/>
+                                                <constraint firstAttribute="centerX" secondItem="JEo-wc-8cF" secondAttribute="centerX" id="HqN-2d-J5R"/>
+                                                <constraint firstAttribute="centerY" secondItem="JEo-wc-8cF" secondAttribute="centerY" id="xUC-P0-YvS"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="HwN-MG-62r">
+                                </cells>
+                            </tableViewSection>
+                            <tableViewSection headerTitle="DatePicker" id="I3U-3v-jNH">
+                                <cells>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="PKV-Io-373">
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="HwN-MG-62r" id="YBf-05-8DH">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PKV-Io-373" id="aP3-IM-crm">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JEo-wc-8cF">
-                                                    <rect key="frame" x="234" y="5" width="132" height="30"/>
-                                                    <state key="normal" title="ActionLocalePicker">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60e-hh-B1B">
+                                                    <rect key="frame" x="217" y="5" width="167" height="30"/>
+                                                    <state key="normal" title="UIDatePickerMode Time">
                                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                                     </state>
                                                     <connections>
-                                                        <action selector="localePickerClicked:" destination="HSJ-wC-erj" eventType="touchUpInside" id="rQI-SW-ueg"/>
+                                                        <action selector="TimePickerClicked:" destination="HSJ-wC-erj" eventType="touchUpInside" id="iKc-f6-UAM"/>
                                                     </connections>
                                                 </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="centerX" secondItem="JEo-wc-8cF" secondAttribute="centerX" id="HqN-2d-J5R"/>
-                                                <constraint firstAttribute="centerY" secondItem="JEo-wc-8cF" secondAttribute="centerY" id="xUC-P0-YvS"/>
+                                                <constraint firstAttribute="centerY" secondItem="60e-hh-B1B" secondAttribute="centerY" id="698-oB-oJB"/>
+                                                <constraint firstAttribute="centerX" secondItem="60e-hh-B1B" secondAttribute="centerX" id="7t0-sl-FEf"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="q9h-ZM-LtB">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="fQj-Gy-eaI">
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fQj-Gy-eaI" id="5HL-9P-BSC">
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hwg-Rl-1ga">
+                                                    <rect key="frame" x="217" y="5" width="166" height="30"/>
+                                                    <state key="normal" title="UIDatePickerMode Date">
+                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
+                                                    <connections>
+                                                        <action selector="DatePickerClicked:" destination="HSJ-wC-erj" eventType="touchUpInside" id="3cR-j0-e5K"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="centerX" secondItem="Hwg-Rl-1ga" secondAttribute="centerX" id="9bw-g7-uve"/>
+                                                <constraint firstAttribute="centerY" secondItem="Hwg-Rl-1ga" secondAttribute="centerY" id="GzK-Kw-Aal"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="03N-CA-zCk">
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="03N-CA-zCk" id="c2k-vn-5la">
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lgK-kh-kbI">
+                                                    <rect key="frame" x="187" y="5" width="227" height="30"/>
+                                                    <state key="normal" title="UIDatePickerMode DateAndTime">
+                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
+                                                    <connections>
+                                                        <action selector="DateAndTimeClicked:" destination="HSJ-wC-erj" eventType="touchUpInside" id="nbs-xk-l9c"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="centerY" secondItem="lgK-kh-kbI" secondAttribute="centerY" id="Gf1-Ta-Q4U"/>
+                                                <constraint firstAttribute="centerX" secondItem="lgK-kh-kbI" secondAttribute="centerX" id="gxC-6N-PTP"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="ovV-BR-3gD">
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ovV-BR-3gD" id="wNc-NC-rhh">
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2XY-HP-JJh">
+                                                    <rect key="frame" x="173" y="5" width="254" height="30"/>
+                                                    <state key="normal" title="UIDatePickerMode CountDownTimer">
+                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                                    </state>
+                                                    <connections>
+                                                        <action selector="CountdownTimerClicked:" destination="HSJ-wC-erj" eventType="touchUpInside" id="qS0-aY-qp6"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="centerY" secondItem="2XY-HP-JJh" secondAttribute="centerY" id="YBf-aA-xdC"/>
+                                                <constraint firstAttribute="centerX" secondItem="2XY-HP-JJh" secondAttribute="centerX" id="hQ0-kU-8bp"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                            <tableViewSection headerTitle="Other" id="W3k-MW-rph">
+                                <cells>
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="40" id="SDj-Yf-ZSQ">
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="q9h-ZM-LtB" id="6iF-6L-rRX">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SDj-Yf-ZSQ" id="Z1J-bh-1Hz">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tfz-EK-DMh">
-                                                    <rect key="frame" x="260" y="5" width="81" height="30"/>
-                                                    <state key="normal" title="Push to self">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2uw-ZK-0n5">
+                                                    <rect key="frame" x="181" y="5" width="239" height="30"/>
+                                                    <state key="normal" title="Push to self (for presentation tests)">
                                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                                     </state>
                                                     <connections>
-                                                        <segue destination="HSJ-wC-erj" kind="show" id="y8L-qN-D82"/>
+                                                        <segue destination="HSJ-wC-erj" kind="show" id="cS1-5C-Uoc"/>
                                                     </connections>
                                                 </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="centerX" secondItem="tfz-EK-DMh" secondAttribute="centerX" id="Sh3-7h-U0k"/>
-                                                <constraint firstAttribute="centerY" secondItem="tfz-EK-DMh" secondAttribute="centerY" id="oC4-oD-Zi3"/>
+                                                <constraint firstAttribute="centerX" secondItem="2uw-ZK-0n5" secondAttribute="centerX" id="kkP-8l-MzD"/>
+                                                <constraint firstAttribute="centerY" secondItem="2uw-ZK-0n5" secondAttribute="centerY" id="yVy-P2-WVf"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="footer" rowHeight="82" id="Kko-tQ-dNj">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="footer" rowHeight="82" id="VZj-IG-45I">
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kko-tQ-dNj" id="YhO-3f-k6f">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VZj-IG-45I" id="RYb-Bv-Dca">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Made improvements?" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="lDt-1e-rWN">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Made improvements?" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="Z0B-iM-46c">
                                                     <rect key="frame" x="230" y="8" width="140" height="17"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="286" id="1F9-jv-ctX"/>
+                                                        <constraint firstAttribute="width" constant="286" id="hFz-K8-lAh"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" size="system"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                     <variation key="default">
                                                         <mask key="constraints">
-                                                            <exclude reference="1F9-jv-ctX"/>
+                                                            <exclude reference="hFz-K8-lAh"/>
                                                         </mask>
                                                     </variation>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Share them here:" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="MUa-zS-rqg">
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Share them here:" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="QZy-Ni-825">
                                                     <rect key="frame" x="245" y="28" width="110" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" size="system"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="https://github.com/skywinder/ActionSheetPicker-3.0" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="l2d-je-V1e">
+                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="https://github.com/skywinder/ActionSheetPicker-3.0" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="wFx-vz-TX0">
                                                     <rect key="frame" x="146" y="45" width="309" height="28"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="309" id="DLh-Tf-4iC"/>
-                                                        <constraint firstAttribute="height" constant="28" id="fhI-Dl-Cuw"/>
+                                                        <constraint firstAttribute="height" constant="28" id="1sB-0v-4d0"/>
+                                                        <constraint firstAttribute="width" constant="309" id="TZR-vk-yee"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -116,20 +188,20 @@
                                                 </textView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="MUa-zS-rqg" firstAttribute="top" secondItem="lDt-1e-rWN" secondAttribute="bottom" constant="3" id="4Ee-a3-gw1"/>
-                                                <constraint firstItem="lDt-1e-rWN" firstAttribute="leading" secondItem="YhO-3f-k6f" secondAttribute="leading" constant="158" id="4SC-Qm-6L4"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="l2d-je-V1e" secondAttribute="bottom" id="4WH-WT-xCV"/>
-                                                <constraint firstAttribute="centerX" secondItem="MUa-zS-rqg" secondAttribute="centerX" id="F8I-Ss-GoL"/>
-                                                <constraint firstItem="lDt-1e-rWN" firstAttribute="centerX" secondItem="MUa-zS-rqg" secondAttribute="centerX" id="Fbq-7U-v3o"/>
-                                                <constraint firstItem="l2d-je-V1e" firstAttribute="top" secondItem="lDt-1e-rWN" secondAttribute="bottom" constant="20" id="QCn-m4-mUl"/>
-                                                <constraint firstAttribute="centerX" secondItem="lDt-1e-rWN" secondAttribute="centerX" id="W5s-dj-bBC"/>
-                                                <constraint firstAttribute="centerX" secondItem="l2d-je-V1e" secondAttribute="centerX" id="amf-c2-SDa"/>
-                                                <constraint firstItem="MUa-zS-rqg" firstAttribute="top" secondItem="lDt-1e-rWN" secondAttribute="bottom" constant="3" id="cJJ-CE-0o9"/>
-                                                <constraint firstItem="l2d-je-V1e" firstAttribute="centerX" secondItem="YhO-3f-k6f" secondAttribute="centerX" id="t8W-i5-Z9j"/>
+                                                <constraint firstAttribute="centerX" secondItem="QZy-Ni-825" secondAttribute="centerX" id="3aT-aO-1nd"/>
+                                                <constraint firstItem="QZy-Ni-825" firstAttribute="top" secondItem="Z0B-iM-46c" secondAttribute="bottom" constant="3" id="7ez-yw-3Fx"/>
+                                                <constraint firstItem="Z0B-iM-46c" firstAttribute="centerX" secondItem="QZy-Ni-825" secondAttribute="centerX" id="FBZ-Xh-Hhl"/>
+                                                <constraint firstAttribute="centerX" secondItem="wFx-vz-TX0" secondAttribute="centerX" id="I03-ph-fKu"/>
+                                                <constraint firstItem="Z0B-iM-46c" firstAttribute="leading" secondItem="RYb-Bv-Dca" secondAttribute="leading" constant="158" id="VDu-Of-DeD"/>
+                                                <constraint firstItem="wFx-vz-TX0" firstAttribute="centerX" secondItem="RYb-Bv-Dca" secondAttribute="centerX" id="bBz-kl-eff"/>
+                                                <constraint firstItem="QZy-Ni-825" firstAttribute="top" secondItem="Z0B-iM-46c" secondAttribute="bottom" constant="3" id="llv-wy-2rb"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="wFx-vz-TX0" secondAttribute="bottom" id="u72-LM-KjC"/>
+                                                <constraint firstItem="wFx-vz-TX0" firstAttribute="top" secondItem="Z0B-iM-46c" secondAttribute="bottom" constant="20" id="yFn-A0-1pS"/>
+                                                <constraint firstAttribute="centerX" secondItem="Z0B-iM-46c" secondAttribute="centerX" id="zK7-pv-WeK"/>
                                             </constraints>
                                             <variation key="default">
                                                 <mask key="constraints">
-                                                    <exclude reference="4SC-Qm-6L4"/>
+                                                    <exclude reference="VDu-Of-DeD"/>
                                                 </mask>
                                             </variation>
                                         </tableViewCellContentView>
@@ -150,7 +222,7 @@
                         </barButtonItem>
                     </navigationItem>
                     <connections>
-                        <outlet property="UIDatePickerModeTime" destination="p6F-Fu-Qq0" id="Kcf-Xo-Kq1"/>
+                        <outlet property="UIDatePickerModeTime" destination="60e-hh-B1B" id="khp-ZY-jXp"/>
                         <outlet property="localePicker" destination="JEo-wc-8cF" id="j7x-5m-qPY"/>
                     </connections>
                 </tableViewController>
diff --git a/Swift-Example/Swift-Example/ViewControllers/SWTableViewController.swift b/Swift-Example/Swift-Example/ViewControllers/SWTableViewController.swift
index 24f0bb69e..b98455401 100644
--- a/Swift-Example/Swift-Example/ViewControllers/SWTableViewController.swift
+++ b/Swift-Example/Swift-Example/ViewControllers/SWTableViewController.swift
@@ -11,20 +11,43 @@ import CoreActionSheetPicker
 
 class SWTableViewController: UITableViewController, UITableViewDelegate {
     @IBOutlet var UIDatePickerModeTime: UIButton!
-    @IBAction func ActionSheetDatePickerClicked(sender: AnyObject) {
-        var datePicker = ActionSheetDatePicker(title: "Date", datePickerMode: UIDatePickerMode.Time, selectedDate: NSDate(), target: self, action: "datePicked:", origin: self.view)
+    @IBAction func TimePickerClicked(sender: AnyObject) {
+        var datePicker = ActionSheetDatePicker(title: "Time:", datePickerMode: UIDatePickerMode.Time, selectedDate: NSDate(), target: self, action: "datePicked:", origin: self.view)
         
         datePicker.minuteInterval = 20
-       
         datePicker.showActionSheetPicker()
         
     }
     
+    @IBAction func DatePickerClicked(sender: AnyObject) {
+        var datePicker = ActionSheetDatePicker(title: "Date:", datePickerMode: UIDatePickerMode.Date, selectedDate: NSDate(), doneBlock: {ActionStringDoneBlock in return}, cancelBlock: {ActionStringCancelBlock in return }, origin: self.view)
+        let secondsInWeek: NSTimeInterval = 7 * 24 * 60 * 60;
+        datePicker.minimumDate = NSDate(timeInterval: -secondsInWeek, sinceDate: NSDate())
+        datePicker.maximumDate = NSDate(timeInterval: secondsInWeek, sinceDate: NSDate())
+
+        datePicker.showActionSheetPicker()
+    }
+
+    @IBAction func DateAndTimeClicked(sender: AnyObject) {
+        var datePicker = ActionSheetDatePicker(title: "DateAndTime:", datePickerMode: UIDatePickerMode.DateAndTime, selectedDate: NSDate(), doneBlock: {ActionStringDoneBlock in return}, cancelBlock: {ActionStringCancelBlock in return }, origin: self.view)
+        let secondsInWeek: NSTimeInterval = 7 * 24 * 60 * 60;
+        datePicker.minimumDate = NSDate(timeInterval: -secondsInWeek, sinceDate: NSDate())
+        datePicker.maximumDate = NSDate(timeInterval: secondsInWeek, sinceDate: NSDate())
+        datePicker.minuteInterval = 20
+
+        datePicker.showActionSheetPicker()
+    }
+    @IBAction func CountdownTimerClicked(sender: AnyObject) {
+        var datePicker = ActionSheetDatePicker(title: "CountDownTimer:", datePickerMode: UIDatePickerMode.CountDownTimer, selectedDate: NSDate(), doneBlock: {ActionStringDoneBlock in return}, cancelBlock: {ActionStringCancelBlock in return }, origin: self.view)
+        
+        datePicker.countDownDuration = 60 * 7
+        datePicker.showActionSheetPicker()
+    }
     @IBAction func navigationItemPicker(sender: AnyObject) {
-        ActionSheetStringPicker.showPickerWithTitle("Nav Bar From Picker", rows: ["One", "Two", "A lot"], initialSelection: 1, doneBlock: nil, cancelBlock: nil, origin: self.view)
+        ActionSheetStringPicker.showPickerWithTitle("Nav Bar From Picker", rows: ["One", "Two", "A lot"], initialSelection: 1, doneBlock: {ActionStringDoneBlock in return}, cancelBlock: {ActionStringCancelBlock in return }, origin: self.view)
     }
     @IBAction func localePickerClicked(sender: AnyObject) {
-        ActionSheetLocalePicker.showPickerWithTitle("Locale picker", initialSelection: NSTimeZone(), doneBlock: nil, cancelBlock: nil, origin: self.view)
+        ActionSheetLocalePicker.showPickerWithTitle("Locale picker", initialSelection: NSTimeZone(), doneBlock: {ActionStringDoneBlock in return}, cancelBlock: {ActionStringCancelBlock in return }, origin: self.view)
         
     }
     @IBOutlet var localePicker: UIButton!