diff --git a/__tests__/__snapshots__/input-moment.js.snap b/__tests__/__snapshots__/input-moment.js.snap
index 0f140b7..e94e68d 100644
--- a/__tests__/__snapshots__/input-moment.js.snap
+++ b/__tests__/__snapshots__/input-moment.js.snap
@@ -2,6 +2,7 @@
 
 exports[`render 1`] = `
 <div
+  amPmFormat={false}
   className="m-input-moment"
 >
   <div
diff --git a/src/input-moment.js b/src/input-moment.js
index a8b35c0..375a3dd 100644
--- a/src/input-moment.js
+++ b/src/input-moment.js
@@ -6,6 +6,7 @@ import Time from './time';
 
 export default class InputMoment extends Component {
   static defaultProps = {
+    amPmFormat: false,
     prevMonthIcon: 'ion-ios-arrow-left',
     nextMonthIcon: 'ion-ios-arrow-right',
     minStep: 1,
@@ -73,6 +74,7 @@ export default class InputMoment extends Component {
             minStep={this.props.minStep}
             hourStep={this.props.hourStep}
             onChange={this.props.onChange}
+            amPmFormat={this.props.amPmFormat}
           />
         </div>
 
diff --git a/src/less/time.less b/src/less/time.less
index a477326..45b386a 100644
--- a/src/less/time.less
+++ b/src/less/time.less
@@ -5,6 +5,7 @@
   padding-top: 50px;
 
   .showtime {
+    position: relative;
     text-align: center;
   }
 
@@ -42,4 +43,12 @@
     border-radius: 3px;
     text-align: center;
   }
+
+  .amPmText {
+    color: @color-blue;
+    font-size: 28px;
+    position: absolute;
+    right: 10px;
+    top: 26px;
+  }
 }
diff --git a/src/time.js b/src/time.js
index 5eaec67..56abc17 100644
--- a/src/time.js
+++ b/src/time.js
@@ -21,9 +21,14 @@ export default class extends Component {
     return (
       <div className={cx('m-time', this.props.className)}>
         <div className="showtime">
-          <span className="time">{m.format('HH')}</span>
+          <span className="time">
+            {this.props.amPmFormat ? m.format("h") : m.format("HH")}
+          </span>
           <span className="separater">:</span>
-          <span className="time">{m.format('mm')}</span>
+          <span className="time">{m.format("mm")}</span>
+          {this.props.amPmFormat && (
+            <span className="amPmText">{m.format("A")}</span>
+          )}
         </div>
 
         <div className="sliders">