diff --git a/CHANGELOG.md b/CHANGELOG.md
index c74dbfdb..8bd38365 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## [1.13.0] - 2019-08-13
+
+### Chore
+
+- [BREAKING CHANGE] Migrating from `moment` to `date-and-time`.
+    - Thanks to [Marcin Krysiak](https://github.com/marcinkrysiak1979) for contributing!
+
+### Fix
+
+- [#184](https://github.com/benhurott/react-native-masked-text/issues/184) TextInputMask doesnt render mask correctly when type change.
+    - Thanks to [Rodrigo Weber](https://github.com/RodrigoAWeber) for contributing!
+
+### Docs
+
+- Fixing documentaion link.
+    - Thanks to [Luan Curti](https://github.com/luancurti) for contributing!
+
 ## [1.12.5] - 2019-08-03
 
 ### Fix
diff --git a/README.md b/README.md
index b5714a64..2e57a2da 100644
--- a/README.md
+++ b/README.md
@@ -535,7 +535,7 @@ console.log(numberValue) // Number
 
 Mask: `accept only numbers`
 
-Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/ZipCode.js)):
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/OnlyNumbers.js)):
 
 
 ```jsx
diff --git a/__tests__/mask/datetime.mask.test.js b/__tests__/mask/datetime.mask.test.js
index c064ec0c..22ba166b 100644
--- a/__tests__/mask/datetime.mask.test.js
+++ b/__tests__/mask/datetime.mask.test.js
@@ -1,9 +1,9 @@
 import { DatetimeMask } from '../../lib/masks'
-var moment = require('moment')
+import date from 'date-and-time';
 
 function compareMomentObj(dateTimeA, dateTimeB) {
-    var momentA = moment(dateTimeA, 'DD/MM/YYYY')
-    var momentB = moment(dateTimeB, 'DD/MM/YYYY')
+    var momentA = new Date(dateTimeA)
+    var momentB = new Date(dateTimeB)
     if (momentA > momentB) return 1
     else if (momentA < momentB) return -1
     else return 0
@@ -94,7 +94,7 @@ test('01011990174030 with format DD/MM/YYYY HH:mm:ss results 01/01/1990 17:40:30
     var expected = '01/01/1990 17:40:30'
     var received = mask.getValue('01011990174030')
 
-    var expectedRawValue = moment(received, 'DD/MM/YYYY HH:mm:ss', true)
+    var expectedRawValue = date.parse(received, 'DD/MM/YYYY HH:mm:ss')
     var receivedRawValue = mask.getRawValue(received)
 
     expect(received).toBe(expected)
diff --git a/dist/lib/masks/datetime.mask.js b/dist/lib/masks/datetime.mask.js
index a3e9eedc..eed58f93 100644
--- a/dist/lib/masks/datetime.mask.js
+++ b/dist/lib/masks/datetime.mask.js
@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _get=function get(object,property,receiver){if(object===null)object=Function.prototype;var desc=Object.getOwnPropertyDescriptor(object,property);if(desc===undefined){var parent=Object.getPrototypeOf(object);if(parent===null){return undefined;}else{return get(parent,property,receiver);}}else if("value"in desc){return desc.value;}else{var getter=desc.get;if(getter===undefined){return undefined;}return getter.call(receiver);}};var _base=require('./_base.mask');var _base2=_interopRequireDefault(_base);var _custom=require('./custom.mask');var _custom2=_interopRequireDefault(_custom);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var moment=require('moment');var DATETIME_MASK_SETTINGS={format:'DD/MM/YYYY HH:mm:ss'};var DatetimeMask=function(_BaseMask){_inherits(DatetimeMask,_BaseMask);function DatetimeMask(){_classCallCheck(this,DatetimeMask);return _possibleConstructorReturn(this,(DatetimeMask.__proto__||Object.getPrototypeOf(DatetimeMask)).apply(this,arguments));}_createClass(DatetimeMask,[{key:'getValue',value:function getValue(value,settings){var mergedSettings=this._getMergedSettings(settings);var mask=this.getMask(value,mergedSettings);return _custom2.default.shared.getValue(value,{mask:mask});}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){var mergedSettings=this._getMergedSettings(settings);return moment(maskedValue,mergedSettings.format,true);}},{key:'validate',value:function validate(value,settings){var maskedValue=this.getValue(value,settings);var mergedSettings=this._getMergedSettings(settings);var isValid=moment(maskedValue,mergedSettings.format,true).isValid();return isValid;}},{key:'_getMergedSettings',value:function _getMergedSettings(settings){return _get(DatetimeMask.prototype.__proto__||Object.getPrototypeOf(DatetimeMask.prototype),'mergeSettings',this).call(this,DATETIME_MASK_SETTINGS,settings);}},{key:'getMask',value:function getMask(value,settings){var mask='';for(var i=0;i<settings.format.length;i++){mask+=settings.format[i].replace(/[a-zA-Z]+/g,'9');}return mask;}}],[{key:'getType',value:function getType(){return'datetime';}}]);return DatetimeMask;}(_base2.default);exports.default=DatetimeMask;
\ No newline at end of file
+Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _get=function get(object,property,receiver){if(object===null)object=Function.prototype;var desc=Object.getOwnPropertyDescriptor(object,property);if(desc===undefined){var parent=Object.getPrototypeOf(object);if(parent===null){return undefined;}else{return get(parent,property,receiver);}}else if("value"in desc){return desc.value;}else{var getter=desc.get;if(getter===undefined){return undefined;}return getter.call(receiver);}};var _base=require('./_base.mask');var _base2=_interopRequireDefault(_base);var _custom=require('./custom.mask');var _custom2=_interopRequireDefault(_custom);var _dateAndTime=require('date-and-time');var _dateAndTime2=_interopRequireDefault(_dateAndTime);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var DATETIME_MASK_SETTINGS={format:'DD/MM/YYYY HH:mm:ss'};var DatetimeMask=function(_BaseMask){_inherits(DatetimeMask,_BaseMask);function DatetimeMask(){_classCallCheck(this,DatetimeMask);return _possibleConstructorReturn(this,(DatetimeMask.__proto__||Object.getPrototypeOf(DatetimeMask)).apply(this,arguments));}_createClass(DatetimeMask,[{key:'getValue',value:function getValue(value,settings){var mergedSettings=this._getMergedSettings(settings);var mask=this.getMask(value,mergedSettings);return _custom2.default.shared.getValue(value,{mask:mask});}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){var mergedSettings=this._getMergedSettings(settings);return _dateAndTime2.default.parse(maskedValue,mergedSettings.format);}},{key:'validate',value:function validate(value,settings){var maskedValue=this.getValue(value,settings);var mergedSettings=this._getMergedSettings(settings);var isValid=_dateAndTime2.default.isValid(maskedValue,mergedSettings.format);return isValid;}},{key:'_getMergedSettings',value:function _getMergedSettings(settings){return _get(DatetimeMask.prototype.__proto__||Object.getPrototypeOf(DatetimeMask.prototype),'mergeSettings',this).call(this,DATETIME_MASK_SETTINGS,settings);}},{key:'getMask',value:function getMask(value,settings){var mask='';for(var i=0;i<settings.format.length;i++){mask+=settings.format[i].replace(/[a-zA-Z]+/g,'9');}return mask;}}],[{key:'getType',value:function getType(){return'datetime';}}]);return DatetimeMask;}(_base2.default);exports.default=DatetimeMask;
\ No newline at end of file
diff --git a/lib/base-text-component.js b/lib/base-text-component.js
index e4da6950..35807a09 100644
--- a/lib/base-text-component.js
+++ b/lib/base-text-component.js
@@ -11,8 +11,8 @@ export default class BaseTextComponent extends PureComponent {
         this._bindProps(this.props);
     }
 
-    componentDidUpdate() {
-        this._bindProps(this.props);
+    componentDidUpdate(prevProps) {
+        this._bindProps(prevProps);
     }
 
     updateValue(text) {
diff --git a/lib/masks/datetime.mask.js b/lib/masks/datetime.mask.js
index b8db9826..d87ebcb3 100644
--- a/lib/masks/datetime.mask.js
+++ b/lib/masks/datetime.mask.js
@@ -1,6 +1,6 @@
 import BaseMask from './_base.mask'
 import CustomMask from './custom.mask'
-var moment = require('moment')
+import date from 'date-and-time'
 
 const DATETIME_MASK_SETTINGS = {
     format: 'DD/MM/YYYY HH:mm:ss'
@@ -20,13 +20,13 @@ export default class DatetimeMask extends BaseMask {
 
     getRawValue(maskedValue, settings) {
         let mergedSettings = this._getMergedSettings(settings)
-        return moment(maskedValue, mergedSettings.format, true)
+        return date.parse(maskedValue, mergedSettings.format)
     }
 
     validate(value, settings) {
-        var maskedValue = this.getValue(value, settings)
+        let maskedValue = this.getValue(value, settings)
         let mergedSettings = this._getMergedSettings(settings)
-        var isValid = moment(maskedValue, mergedSettings.format, true).isValid()
+        let isValid = date.isValid(maskedValue, mergedSettings.format)
         return isValid
     }
 
@@ -37,7 +37,7 @@ export default class DatetimeMask extends BaseMask {
     getMask(value, settings) {
         let mask = ''
 
-        for (var i = 0; i < settings.format.length; i++) {
+        for (let i = 0; i < settings.format.length; i++) {
             mask += settings.format[i].replace(/[a-zA-Z]+/g, '9')
         }
 
diff --git a/package.json b/package.json
index 574624ab..678ec2b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.12.5",
+    "version": "1.13.0",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {
@@ -36,14 +36,14 @@
     },
     "homepage": "https://github.com/benhurott/react-native-masked-text#readme",
     "dependencies": {
-        "moment": "2.19.3",
-        "tinymask": "^1.0.2"
+        "date-and-time": "0.9.0",
+        "tinymask": "1.0.2"
     },
     "devDependencies": {
         "@types/react-native": "*",
         "@types/react": "*",
-        "babel-cli": "^6.26.0",
-        "rimraf": "^2.6.2",
+        "babel-cli": "6.26.0",
+        "rimraf": "2.6.2",
         "react": "16.3.1",
         "react-native": "0.55.4",
         "babel-jest": "23.4.2",
diff --git a/yarn.lock b/yarn.lock
index bb455c5e..afa7a847 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2040,6 +2040,11 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
+date-and-time@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-0.9.0.tgz#1524579e56dc07675c640b41735a7665c0659240"
+  integrity sha512-4JybB6PbR+EebpFx/KyR5Ybl+TcdXMLIJkyYsCx3P4M4CWGMuDyFF19yh6TyasMAIF5lrsgIxiSHBXh2FFc7Fg==
+
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"