diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1fc7f80..aa64d285 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## [1.10.0] - 2019-01-06
+
+### Added
+
+- Credit Card Mask: adding support for `diners` and `amex`. (Thanks to [Marin Bezhanov](https://github.com/mbezhanov))
+
+### Fix
+
+- [#107](https://github.com/benhurott/react-native-masked-text/issues/107): Props missing - TypeScript map out of date.
+- [#115](https://github.com/benhurott/react-native-masked-text/issues/115): setNativeProps is not a function
+
 ## [1.9.2] - 2018-10-06
 
 ### Fixed
diff --git a/README.md b/README.md
index 37900f58..64196711 100644
--- a/README.md
+++ b/README.md
@@ -313,8 +313,13 @@ Some types accept options, use it like this: `<TextInputMask type={'money'} opti
 
 **For `type={'credit-card'}`** <br />
 
--   _options={...}_ \* `obfuscated` (Boolean, default false): if the mask must be `9999 **** **** 9999`
-
+-   _options={...}_
+    -   `obfuscated` (Boolean, default false): if the mask must be `9999 **** **** 9999`.
+    -   `issuer` (String, default 'visa-or-mastercard'): the credit card issuer.
+        - options:
+            - `visa-or-mastercard`: will apply the mask `9999 9999 9999 9999` / `9999 **** **** 9999`.
+            - `amex`: will apply the mask `9999 999999 99999` / `9999 ****** 99999`.
+            - `diners`: will apply the mask `9999 999999 9999` / `9999 ****** 9999`.
 ### Methods
 
 -   `getElement()`: return the instance of _TextInput_ component.
diff --git a/__tests__/mask/credit-card.mask.test.js b/__tests__/mask/credit-card.mask.test.js
index 86e3c57b..0760d828 100644
--- a/__tests__/mask/credit-card.mask.test.js
+++ b/__tests__/mask/credit-card.mask.test.js
@@ -88,3 +88,19 @@ test('getMask obfuscated returns 9999 **** **** 9999', () => {
 
     expect(received).toBe(expected)
 })
+
+test('get masked value with amex issuer must return 1234 123456 12345', () => {
+    var mask = new CreditCardMask()
+    var expected = '1234 123456 12345'
+    var received = mask.getValue('123412345612345', { issuer: 'amex' })
+
+    expect(received).toBe(expected)
+})
+
+test('getMask with diners issuer must return 1234 123456 1234', () => {
+    var mask = new CreditCardMask()
+    var expected = '1234 123456 1234'
+    var received = mask.getValue('12341234561234', { issuer: 'diners' })
+
+    expect(received).toBe(expected)
+})
\ No newline at end of file
diff --git a/dist/lib/masks/credit-card.mask.js b/dist/lib/masks/credit-card.mask.js
index c3a2ef2d..d38ca78d 100644
--- a/dist/lib/masks/credit-card.mask.js
+++ b/dist/lib/masks/credit-card.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 CREDIT_CARD_MASK='9999 9999 9999 9999';var CREDIT_CARD_OBFUSCATED_MASK='9999 **** **** 9999';var CREDIT_CARD_SETTINGS={obfuscated:false};var MASK_TRANSLATION={'*':function _(val){return null;}};var CreditCardMask=function(_BaseMask){_inherits(CreditCardMask,_BaseMask);function CreditCardMask(){_classCallCheck(this,CreditCardMask);return _possibleConstructorReturn(this,(CreditCardMask.__proto__||Object.getPrototypeOf(CreditCardMask)).apply(this,arguments));}_createClass(CreditCardMask,[{key:'getValue',value:function getValue(value,settings){var selectedMask=this.getMask(value,settings);return _custom2.default.shared.getValue(value,{mask:selectedMask,translation:MASK_TRANSLATION});}},{key:'validate',value:function validate(value,settings){if(!!value){var selectedMask=this.getMask(value,settings);return value.length===selectedMask.length;}return true;}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){if(!maskedValue)return[];return maskedValue.split(' ').map(function(val){if(!val)return'';return val.trim();});}},{key:'getMask',value:function getMask(value,settings){var mergedSettings=_get(CreditCardMask.prototype.__proto__||Object.getPrototypeOf(CreditCardMask.prototype),'mergeSettings',this).call(this,CREDIT_CARD_SETTINGS,settings);var selectedMask=mergedSettings.obfuscated?CREDIT_CARD_OBFUSCATED_MASK:CREDIT_CARD_MASK;return selectedMask;}}],[{key:'getType',value:function getType(){return'credit-card';}}]);return CreditCardMask;}(_base2.default);exports.default=CreditCardMask;
\ 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);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 CREDIT_CARD_MASKS={'visa-or-mastercard':{regular:'9999 9999 9999 9999',obfuscated:'9999 **** **** 9999'},'amex':{regular:'9999 999999 99999',obfuscated:'9999 ****** 99999'},'diners':{regular:'9999 999999 9999',obfuscated:'9999 ****** 9999'}};var CREDIT_CARD_SETTINGS={obfuscated:false,issuer:'visa-or-mastercard'};var MASK_TRANSLATION={'*':function _(val){return null;}};var CreditCardMask=function(_BaseMask){_inherits(CreditCardMask,_BaseMask);function CreditCardMask(){_classCallCheck(this,CreditCardMask);return _possibleConstructorReturn(this,(CreditCardMask.__proto__||Object.getPrototypeOf(CreditCardMask)).apply(this,arguments));}_createClass(CreditCardMask,[{key:'getValue',value:function getValue(value,settings){var selectedMask=this.getMask(value,settings);return _custom2.default.shared.getValue(value,{mask:selectedMask,translation:MASK_TRANSLATION});}},{key:'validate',value:function validate(value,settings){if(!!value){var selectedMask=this.getMask(value,settings);return value.length===selectedMask.length;}return true;}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){if(!maskedValue)return[];return maskedValue.split(' ').map(function(val){if(!val)return'';return val.trim();});}},{key:'getMask',value:function getMask(value,settings){var mergedSettings=_get(CreditCardMask.prototype.__proto__||Object.getPrototypeOf(CreditCardMask.prototype),'mergeSettings',this).call(this,CREDIT_CARD_SETTINGS,settings);var selectedMask=this._selectMask(mergedSettings.issuer,mergedSettings.obfuscated);return selectedMask;}},{key:'_selectMask',value:function _selectMask(issuer,obfuscated){var maskType=obfuscated?'obfuscated':'regular';return CREDIT_CARD_MASKS[issuer][maskType];}}],[{key:'getType',value:function getType(){return'credit-card';}}]);return CreditCardMask;}(_base2.default);exports.default=CreditCardMask;
\ No newline at end of file
diff --git a/dist/lib/text-input-mask.js b/dist/lib/text-input-mask.js
index 893d92aa..8def18a3 100644
--- a/dist/lib/text-input-mask.js
+++ b/dist/lib/text-input-mask.js
@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='./lib/text-input-mask.js';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 _react=require('react');var _react2=_interopRequireDefault(_react);var _reactNative=require('react-native');var _baseTextComponent=require('./base-text-component');var _baseTextComponent2=_interopRequireDefault(_baseTextComponent);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 TextInputMask=function(_BaseTextComponent){_inherits(TextInputMask,_BaseTextComponent);function TextInputMask(){_classCallCheck(this,TextInputMask);return _possibleConstructorReturn(this,(TextInputMask.__proto__||Object.getPrototypeOf(TextInputMask)).apply(this,arguments));}_createClass(TextInputMask,[{key:'getElement',value:function getElement(){return this._inputElement;}},{key:'_onChangeText',value:function _onChangeText(text){var _this2=this;var self=this;if(!this._checkText(text)){return;}self.updateValue(text).then(function(maskedText){if(self.props.onChangeText){_this2.getElement().setNativeProps({text:maskedText});self.props.onChangeText(maskedText);}});}},{key:'_checkText',value:function _checkText(text){if(this.props.checkText){return this.props.checkText(this.state.value,text);}return true;}},{key:'_getKeyboardType',value:function _getKeyboardType(){return this.props.keyboardType||this._maskHandler.getKeyboardType();}},{key:'render',value:function render(){var _this3=this;var Input=_reactNative.TextInput;var customTextInputProps={};if(this.props.customTextInput){Input=this.props.customTextInput;customTextInputProps=this.props.customTextInputProps||{};}return _react2.default.createElement(Input,_extends({ref:function ref(_ref){if(_ref){_this3._inputElement=_ref;if(typeof _this3.props.refInput==='function'){_this3.props.refInput(_ref);}}},keyboardType:this._getKeyboardType()},this.props,customTextInputProps,{onChangeText:function onChangeText(text){return _this3._onChangeText(text);},value:this.state.value,__source:{fileName:_jsxFileName,lineNumber:48}}));}}]);return TextInputMask;}(_baseTextComponent2.default);exports.default=TextInputMask;
\ No newline at end of file
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='./lib/text-input-mask.js';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 _react=require('react');var _react2=_interopRequireDefault(_react);var _reactNative=require('react-native');var _baseTextComponent=require('./base-text-component');var _baseTextComponent2=_interopRequireDefault(_baseTextComponent);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 TextInputMask=function(_BaseTextComponent){_inherits(TextInputMask,_BaseTextComponent);function TextInputMask(){_classCallCheck(this,TextInputMask);return _possibleConstructorReturn(this,(TextInputMask.__proto__||Object.getPrototypeOf(TextInputMask)).apply(this,arguments));}_createClass(TextInputMask,[{key:'getElement',value:function getElement(){return this._inputElement;}},{key:'_onChangeText',value:function _onChangeText(text){var _this2=this;var self=this;if(!this._checkText(text)){return;}self.updateValue(text).then(function(maskedText){if(self.props.onChangeText){_this2._trySetNativeProps(maskedText);self.props.onChangeText(maskedText);}});}},{key:'_trySetNativeProps',value:function _trySetNativeProps(maskedText){try{this.getElement().setNativeProps({text:maskedText});}catch(error){}}},{key:'_checkText',value:function _checkText(text){if(this.props.checkText){return this.props.checkText(this.state.value,text);}return true;}},{key:'_getKeyboardType',value:function _getKeyboardType(){return this.props.keyboardType||this._maskHandler.getKeyboardType();}},{key:'render',value:function render(){var _this3=this;var Input=_reactNative.TextInput;var customTextInputProps={};if(this.props.customTextInput){Input=this.props.customTextInput;customTextInputProps=this.props.customTextInputProps||{};}return _react2.default.createElement(Input,_extends({ref:function ref(_ref){if(_ref){_this3._inputElement=_ref;if(typeof _this3.props.refInput==='function'){_this3.props.refInput(_ref);}}},keyboardType:this._getKeyboardType()},this.props,customTextInputProps,{onChangeText:function onChangeText(text){return _this3._onChangeText(text);},value:this.state.value,__source:{fileName:_jsxFileName,lineNumber:56}}));}}]);return TextInputMask;}(_baseTextComponent2.default);exports.default=TextInputMask;
\ No newline at end of file
diff --git a/index.d.ts b/index.d.ts
index 6f937ea1..125a7d2e 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -40,6 +40,7 @@ export interface TextInputMaskOptionProp {
 
     // Credit card type.
     obfuscated?: boolean
+    issuer: 'visa-or-mastercard' | 'diners' | 'amex'
 
     // Custom type.
     mask?: string
@@ -55,6 +56,8 @@ export interface TextInputMaskProps extends TextInputProps {
     checkText?: (previous: string, next: string) => boolean
     onChangeText?: (text: string) => void
     refInput?: (ref: any) => void
+    customTextInput?: any
+    customTextInputProps?: Object
 }
 
 // TextInputMask Component
diff --git a/lib/masks/credit-card.mask.js b/lib/masks/credit-card.mask.js
index 0422863c..8db3fe7d 100644
--- a/lib/masks/credit-card.mask.js
+++ b/lib/masks/credit-card.mask.js
@@ -1,11 +1,24 @@
 import BaseMask from './_base.mask'
 import CustomMask from './custom.mask'
 
-const CREDIT_CARD_MASK = '9999 9999 9999 9999'
-const CREDIT_CARD_OBFUSCATED_MASK = '9999 **** **** 9999'
+const CREDIT_CARD_MASKS = {
+    'visa-or-mastercard': {
+        regular: '9999 9999 9999 9999',
+        obfuscated: '9999 **** **** 9999'
+    },
+    'amex': {
+        regular: '9999 999999 99999',
+        obfuscated: '9999 ****** 99999'
+    },
+    'diners': {
+        regular: '9999 999999 9999',
+        obfuscated: '9999 ****** 9999'
+    },
+}
 
 const CREDIT_CARD_SETTINGS = {
-    obfuscated: false
+    obfuscated: false,
+    issuer: 'visa-or-mastercard'
 }
 
 const MASK_TRANSLATION = {
@@ -46,9 +59,14 @@ export default class CreditCardMask extends BaseMask {
 
     getMask(value, settings) {
         let mergedSettings = super.mergeSettings(CREDIT_CARD_SETTINGS, settings)
-        let selectedMask = mergedSettings.obfuscated
-            ? CREDIT_CARD_OBFUSCATED_MASK
-            : CREDIT_CARD_MASK
+        const selectedMask = this._selectMask(mergedSettings.issuer, mergedSettings.obfuscated)
+
         return selectedMask
     }
+
+    _selectMask(issuer, obfuscated) {
+        const maskType = obfuscated ? 'obfuscated' : 'regular'
+
+        return CREDIT_CARD_MASKS[issuer][maskType]
+    }
 }
diff --git a/lib/text-input-mask.js b/lib/text-input-mask.js
index f3a2363b..916c1f22 100644
--- a/lib/text-input-mask.js
+++ b/lib/text-input-mask.js
@@ -17,12 +17,20 @@ export default class TextInputMask extends BaseTextComponent {
 
         self.updateValue(text).then(maskedText => {
             if (self.props.onChangeText) {
-                this.getElement().setNativeProps({ text: maskedText })
+                this._trySetNativeProps(maskedText)
                 self.props.onChangeText(maskedText)
             }
         })
     }
 
+    _trySetNativeProps(maskedText) {
+        try {
+            this.getElement().setNativeProps({ text: maskedText })
+        } catch (error) {
+            // silent
+        }
+    }
+
     _checkText(text) {
         if (this.props.checkText) {
             return this.props.checkText(this.state.value, text)
diff --git a/package.json b/package.json
index c34571bd..7c224a97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.9.2",
+    "version": "1.10.0",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {