diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5ab7a73..c67ad959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## [1.11.0] - 2019-02-23
+
+### Added
+
+- Adding `maskType` to `cel-phone` with options: `BRL` and `INTERNATIONAL`.
+
+### Changed
+
+- New documentation in `README`.
+
+### Removed
+
+- [BREAKING CHANGE] The `zeroCents` option was removed from `money` mask, if you want to not show the cents, use the `precision: 0`.
+
+
 ## [1.10.1] - 2019-01-07
 
 ### Fixed
diff --git a/README.md b/README.md
index 64196711..2abe6a8c 100644
--- a/README.md
+++ b/README.md
@@ -17,387 +17,612 @@ React-native: 0.32.0 or higher
 
 ## Usage (TextInputMask)
 
-```jsx
-import React, { Component } from 'react'
+For all the masks you will use in this way:
 
-// import the component
+```jsx
 import { TextInputMask } from 'react-native-masked-text'
 
-export default class MyComponent extends Component {
-	constructor(props) {
-		super(props)
-	}
-
-	componentDidMount() {
-		// isValid method returns if the inputed value is valid.
-		// Ex: if you input 40/02/1990 30:20:20, it will return false
-		//	   because in this case, the day and the hour is invalid.
-		let valid = this.myDateText.isValid();
-
-		// get converted value. Using type=datetime, it returns the moment object.
-		// If it's using type=money, it returns a Number object.
-		let rawValue = this.myDateText.getRawValue();
-	}
-
-	render() {
-		// the type is required but options is required only for some specific types.
-		return (
-			<TextInputMask
-				ref={(ref) => this.myDateText = ref}
-				type={'datetime'}
-				options={{
-					format: 'DD-MM-YYYY HH:mm:ss'
-				}}
-			/>
-		)
-	}
-}
+//...
+
+<TextInputMask
+  type={'type-of-the-mask'}
+  options={
+    {
+      // the options for your mask if needed
+    }
+  }
+  value={this.state.text}
+  onChangeText={text => {
+    this.setState({
+      text: text
+    })
+  }}
+/>
 ```
 
-### Props
+### Cel Phone
 
-#### type
+Mask:
 
-_credit-card_: use the mask 9999 9999 9999 9999. It accepts options (see later in this doc). <br />
-_cpf_: use the mask `999.999.999-99` and `numeric` keyboard. <br />
-_cnpj_: use the mask `99.999.999/9999-99` and `numeric` keyboard. <br />
-_zip-code_: use the mask `99999-999` and `numeric` keyboard. <br />
-_only-numbers_: accept only numbers on field with `numeric` keyboard. <br />
-_money_: use the mask `R$ 0,00` on the field with `numeric` keyboard. It accepts options (see later in this doc). <br />
-_cel-phone_: use the mask `(99) 9999-9999` or `(99) 99999-9999` (changing automaticaly by length). It accepts options (see later in this doc). <br />
-_datetime_: use datetime mask with moment format (default DD/MM/YYYY HH:mm:ss). It accepts options (see later in this doc). <br />
-_custom_: use your custom mask (see the options props later in this doc). <br />
+-   BRL (default): `(99) 9999-9999` or `(99) 99999-9999` (will detect automatically)
+-   INTERNATIONAL: `+999 999 999 999`
 
-#### onChangeText
+If you need a different formatting, use the `Custom` mask =).
 
-Invoked after new value applied to mask.
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/CelPhone.js)):
 
 ```jsx
-/**
- * @param {String} text the text AFTER mask is applied.
-*/
-onChangeText(text) {
-	// ...
-}
+<TextInputMask
+  type={'cel-phone'}
+  options={{
+    maskType: 'BRL',
+    withDDD: true,
+    dddMask: '(99) '
+  }}
+  value={this.state.international}
+  onChangeText={text => {
+    this.setState({
+      international: text
+    })
+  }}
+/>
+```
+#### Options
 
+| name       | type    | required | default | description |
+| ---------- | ------- | -------- | ------- | ----------- |
+| maskType | string | no | `maskType` | the type of the mask to use. Available: `BRL` or `INTERNATIONAL` |
+| withDDD | boolean | no | `true` | if the mask type is `BRL`, include the DDD |
+| dddMask | string | no | `(99) ` | if the mask type is `BRL`, the DDD mask |
+
+#### Methods
+
+You can get the `unmasked` value using the `getRawValue` method:
+
+```jsx
 <TextInputMask
-	type={'only-numbers'}
-	onChangeText={this.onChangeText.bind(this)} />
+  type={'cel-phone'}
+  options={{
+    maskType: 'BRL',
+    withDDD: true,
+    dddMask: '(99) '
+  }}
+  value={this.state.international}
+  onChangeText={text => {
+    this.setState({
+      international: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.phoneField = ref}
+/>
+
+//...
+
+const unmasked = this.phoneField.getRawValue()
+// in the mask: (51) 98765-4321
+// unmasked: 51987654321
 ```
 
-#### checkText
 
-Allow you to check and prevent value to be inputed.
+### CPF
+
+Mask: `999.999.999-99`
+
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/Cpf.js)):
 
 ```jsx
-/**
- * @param {String} previous the previous text in the masked field.
- * @param {String} next the next text that will be setted to field.
- * @return {Boolean} return true if must accept the value.
-*/
-checkText(previous, next) {
-	return next === 'your valid value or other boolean condition';
-}
+<TextInputMask
+  type={'cpf'}
+  value={this.state.cpf}
+  onChangeText={text => {
+    this.setState({
+      cpf: text
+    })
+  }}
+/>
+```
+
+#### Methods
 
+You can check if the cpf is valid by calling the `isValid()` method:
+
+```jsx
 <TextInputMask
-	type={'only-numbers'}
-	checkText={this.checkText.bind(this)} />
+  type={'cpf'}
+  value={this.state.cpf}
+  onChangeText={text => {
+    this.setState({
+      cpf: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.cpfField = ref}
+/>
+
+// get the validation
+
+const cpfIsValid = this.cpfField.isValid()
+console.log(cpfIsValid) // boolean
 ```
 
-#### customTextInput
+You can get the `unmasked` cpf calling the `getRawValue` method:
+
+```jsx
+const unmasked = this.cpfField.getRawValue()
+// in the mask: 123.456.789-01
+// unmasked: 12345678901
+```
 
-You can use this prop if you want custom text input instead native TextInput component:
+### CNPJ
+
+Mask: `99.999.999/9999-99`
+
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/Cnpj.js)):
 
 ```jsx
-const Textfield = MKTextField.textfield()
-  .withPlaceholder('Text...')
-  .withStyle(styles.textfield)
-  .build();
+<TextInputMask
+  type={'cnpj'}
+  value={this.state.cnpj}
+  onChangeText={text => {
+    this.setState({
+      cnpj: text
+    })
+  }}
+/>
+```
 
+#### Methods
 
+You can check if the cnpj is valid by calling the `isValid()` method:
+
+```jsx
 <TextInputMask
-	ref={(ref) => this.myDateText = ref}
-	type={'money'}
-	style={styles.input}
-	customTextInput={Textfield}
-	placeholder="Enter text to see events"
+  type={'cnpj'}
+  value={this.state.cnpj}
+  onChangeText={text => {
+    this.setState({
+      cnpj: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.cnpjField = ref}
 />
+
+// get the validation
+
+const cnpjIsValid = this.cnpjField.isValid()
+console.log(cnpjIsValid) // boolean
 ```
 
-#### customTextInputProps
 
-Some custom inputs like [react-native-textinput-effects](https://github.com/halilb/react-native-textinput-effects) have to set properties in mount time. For these types of components we use this property.
+You can get the `unmasked` cpf calling the `getRawValue` method:
 
 ```jsx
-import React from 'react'
-import { StyleSheet, View } from 'react-native'
+const unmasked = this.cnpjField.getRawValue()
+// in the mask: 99.999.999/9999-99
+// unmasked: 99999999999999
+```
 
-import { TextInputMask } from 'react-native-masked-text'
-import { Kaede } from 'react-native-textinput-effects'
+### Credit Card
 
-export default class App extends React.Component {
-  constructor(props) {
-    super(props)
+Mask:
 
-    this.state = {
-      birthday: ''
-    }
-  }
+-   visa or master: `9999 9999 9999 9999` or `9999 **** **** 9999` (obfuscated)
+-   amex: `9999 999999 99999` or `9999 ****** 99999` (obfuscated)
+-   diners: `9999 999999 9999` or `9999 ****** 9999` (obfuscated)
 
-  render() {
-    return (
-      <View style={styles.container}>
-        <TextInputMask
-          ref={(ref) => this.myDateText = ref}
-          // here we set the custom component and their props.
-          customTextInput={Kaede}
-          customTextInputProps={{
-            style:{ width: '80%' },
-            label:'Birthday'
-          }}
-
-          type={'datetime'}
-          options={{
-            format: 'DD-MM-YYYY HH:mm:ss'
-          }}
-
-          // don't forget: the value and state!
-          onChangeText={birthday => this.setState({ birthday })}
-          value={this.state.birthday} />
-      </View>
-    );
-  }
-}
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/CreditCard.js))
 
-const styles = StyleSheet.create({
-	container: {
-		flex: 1,
-		backgroundColor: '#fff',
-		alignItems: 'center',
-		justifyContent: 'center'
-	}
-})
+```jsx
+<TextInputMask
+  type={'credit-card'}
+  options={{
+    obfuscated: false,
+    issuer: 'amex'
+  }}
+  value={this.state.creditCard}
+  onChangeText={text => {
+    this.setState({
+      creditCard: text
+    })
+  }}
+/>
 ```
 
-#### TextInput Props
+#### Options
 
-You can use the native props of TextInput, with this in mind:
+| name       | type    | required | default              | description |
+| ---------- | ------- | -------- | -------------------- | ----------- |
+| obfuscated | boolean | no       | `false`              | if the mask should be obfuscated or not|
+| issuer     | string  | no       | `visa-or-mastercard` | the type of the card mask. The options are: `visa-or-mastercard`, `amex` or `diners` |
 
--   onChangeText is intercepted by component.
--   value is intercepted by component.
--   if you pass keyboardType, it will override the keyboardType of masked component.
 
-#### TextInput Methods
+#### Methods
 
-If you want to use the methods of the native TextInput, use the `getElement()` method:
+You can get the array containing the groups of the value value using the `getRawValue` method:
 
 ```jsx
-export default class App extends React.Component {
-    onGoFocus() {
-        // when you call getElement method, the instance of native TextInput will returned.
-        this._myTextInputMask.getElement().focus()
-    }
+<TextInputMask
+  type={'credit-card'}
+  options={{
+    obfuscated: false,
+    issuer: 'amex'
+  }}
+  value={this.state.creditCard}
+  onChangeText={text => {
+    this.setState({
+      creditCard: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.creditCardField = ref}
+/>
 
-    render() {
-        return (
-            <View style={styles.container}>
-                <View>
-                    <TextInputMask
-                        ref={ref => (this._myTextInputMask = ref)}
-                        type={'only-numbers'}
-                        style={styles.input}
-                    />
-                </View>
-                <View>
-                    <Button
-                        onPress={this.onGoFocus.bind(this)}
-                        title="Go Focus Hue"
-                        color="#841584"
-                    />
-                </View>
-            </View>
-        )
+//...
+
+const unmasked = this.creditCardField.getRawValue()
+// in the mask: 9874 6541 3210 9874
+// unmasked: [9874, 6541, 3210, 9874]
+```
+
+### Custom
+
+Mask: `defined by pattern`
+
+* `9` - accept digit.
+* `A` - accept alpha.
+* `S` - accept alphanumeric.
+* `*` - accept all, EXCEPT white space.
+
+Ex: `AAA-9999` 
+
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/Custom.js)):
+
+```jsx
+//
+// SIMPLE
+// 
+<TextInputMask
+  type={'custom'}
+  options={{
+    /**
+     * mask: (String | required | default '')
+     * the mask pattern
+     * 9 - accept digit.
+     * A - accept alpha.
+     * S - accept alphanumeric.
+     * * - accept all, EXCEPT white space.
+    */
+    mask: '999 AAA SSS ***'
+  }}
+  value={this.state.text}
+  onChangeText={text => {
+    this.setState({
+      text: text
+    })
+  }}
+  style={textInputStype}
+/>
+
+
+//
+// ADVANCED
+// 
+<TextInputMask
+  type={'custom'}
+  options={{
+    // required
+
+    /**
+     * mask: (String | required | default '')
+     * the mask pattern
+     * 9 - accept digit.
+     * A - accept alpha.
+     * S - accept alphanumeric.
+     * * - accept all, EXCEPT white space.
+    */
+    mask: '999 AAA SSS ***',
+
+    // optional
+
+    /**
+     * validator: (Function | optional | defaults returns true)
+     * use this funcion to inform if the inputed value is a valid value (for invalid phone numbers, for example). The isValid method use this validator.
+    */
+    validator: function(value, settings) {
+      return true
+    },
+
+    /**
+     * getRawValue: (Function | optional | defaults return current masked value)
+     * use this function to parse and return values to use what you want.
+     * for example, if you want to create a phone number mask (999) 999-99-99 but want to get only
+     * the numbers for value, use this method for this parse step.
+    */
+    getRawValue: function(value, settings) {
+      return 'my converted value';
+    },
+    /**
+     * translation: (Object | optional | defaults 9, A, S, *)
+     * the dictionary that translate mask and value.
+     * you can change defaults by simple override the key (9, A, S, *) or create some new.
+    */
+    translation: {
+      // this is a custom translation. The others (9, A, S, *) still works.
+      // this translation will be merged and turns into 9, A, S, *, #.
+      '#': function(val) {
+        if (val === ' ') {
+          return val;
+        }
+
+        // if returns null, undefined or '' (empty string), the value will be ignored.
+        return null;
+      },
+      // in this case, we will override build-in * translation (allow all characters)
+      // and set this to allow only blank spaces and some special characters.
+      '*': function(val) {
+        return [' ', '#', ',', '.', '!'].indexOf(val) >= 0 ? val : null;
+      }
     }
-}
+  }}
+  value={this.state.text}
+  onChangeText={text => {
+    this.setState({
+      text: text
+    })
+  }}
+  style={textInputStype}
+/>
 ```
 
 #### Options
 
-Some types accept options, use it like this: `<TextInputMask type={'money'} options={{ unit: 'US$' }} />`
+| name       | type    | required | default              | description |
+| ---------- | ------- | -------- | -------------------- | ----------- |
+| mask | string | **YES** | | The mask pattern |
+| validator | function | no | function that returns `true` | the function that's validate the value in the mask |
+| getRawValue | function | no | return current value | function to parsed value (like unmasked or converted) |
+| translation | object (map{string,function}) | no | `9 - digit`, `A - alpha`, `S - alphanumeric`, `* - all, except space` | The translator to use in the pattern |
 
-**For `type={'money'}`** <br />
 
--   _options={...}_
-    -   `precision` (Number, default 2): the decimal places.
-    -   `separator` (String, default ','): the decimal separator.
-    -   `delimiter` (String, default '.'): the thousand separator.
-    -   `unit`: (String, default 'R$'): the prefix text.
-    -   `suffixUnit` (String, default ''): the suffix text.
-    -   `zeroCents` (Boolean, default false): if must show cents.
+### Datetime
 
-**For `type={'cel-phone'}`** <br />
+Mask:
 
--   _options={...}_
-    -   `withDDD` (Boolean, default true): if the ddd will be include in the mask.
-    -   `dddMask` (String, default '(99) '): the default mask applied if `withDDD` is true.
+* `DD/MM/YYYY HH:mm:ss`
+* `DD/MM/YYYY`
+* `MM/DD/YYYY`
+* `YYYY/MM/DD`
+* `HH:mm:ss`
+* `HH:mm`
+* `HH`
 
-**For `type={'datetime'}`** <br />
+You can use `-` instead of `/` if you want.
 
--   _options={...}_
-    -   `format` (String, default DD/MM/YYYY HH:mm:ss): moment date format. It accepts the following:
-    -   DD/MM/YYYY HH:mm:ss
-    -   DD/MM/YYYY
-    -   MM/DD/YYYY
-    -   YYYY/MM/DD
-    -   HH:mm:ss
-    -   HH:mm
-    -   HH
-    -   _You can use all of dates with `-` instead of `/` if you want_
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/Datetime.js)):
+
+```jsx
+<TextInputMask
+  type={'datetime'}
+  options={{
+    format: 'YYYY/MM/DD'
+  }}
+  value={this.state.dt}
+  onChangeText={text => {
+    this.setState({
+      dt: text
+    })
+  }}
+/>
+```
+
+#### Options
+
+| name       | type    | required | default              | description |
+| ---------- | ------- | -------- | -------------------- | ----------- |
+| format | string | **YES** | | The date format to be validated |
 
-**For `type={'custom'}`** <br />
 
--   _options={...}_
+#### Methods
+
+You can check if the date is valid by calling the `isValid()` method:
 
 ```jsx
-{
-	/**
-	 * mask: (String | required | default '')
-	 * the mask pattern
-	 * 9 - accept digit.
-	 * A - accept alpha.
-	 * S - accept alphanumeric.
-	 * * - accept all, EXCEPT white space.
-	*/
-	mask: '999#AAA',
-
-	/**
-	 * validator: (Function | optional | defaults returns true)
-	 * use this funcion to inform if the inputed value is a valid value (for invalid phone numbers, for example). The isValid method use this validator.
-	*/
-	validator: function(value, settings) {
-		return true
-	},
-	/**
-	 * getRawValue: (Function | optional | defaults return current masked value)
-	 * use this function to parse and return values to use what you want.
-	 * for example, if you want to create a phone number mask (999) 999-99-99 but want to get only
-	 * the numbers for value, use this method for this parse step.
-	*/
-	getRawValue: function(value, settings) {
-		return 'my converted value';
-	},
-	/**
-	 * translation: (Object | optional | defaults 9, A, S, *)
-	 * the dictionary that translate mask and value.
-	 * you can change defaults by simple override the key (9, A, S, *) or create some new.
-	*/
-	translation: {
-		// this is a custom translation. The others (9, A, S, *) still works.
-		// this translation will be merged and turns into 9, A, S, *, #.
-		'#': function(val) {
-			if (val === ' ') {
-				return val;
-			}
-
-			// if returns null, undefined or '' (empty string), the value will be ignored.
-			return null;
-		},
-		// in this case, we will override build-in * translation (allow all characters)
-		// and set this to allow only blank spaces and some special characters.
-		'*': function(val) {
-			return [' ', '#', ',', '.', '!'].indexOf(val) >= 0 ? val : null;
-		}
-	}
-}
+<TextInputMask
+  type={'datetime'}
+  options={{
+    format: 'YYYY/MM/DD'
+  }}
+  value={this.state.dt}
+  onChangeText={text => {
+    this.setState({
+      dt: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.datetimeField = ref}
+/>
+
+// get the validation
+
+const isValid = this.datetimeField.isValid()
+console.log(isValid) // boolean
 ```
 
-**For `type={'credit-card'}`** <br />
+You can get the [moment](https://momentjs.com/) object from the date if it's valid calling the `getRawValue` method:
 
--   _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
+```jsx
+const momentDate = this.datetimeField.getRawValue()
+```
+
+### Money
+
+Mask: `R$999,99` (fully customizable)
 
--   `getElement()`: return the instance of _TextInput_ component.
--   `isValid()`: if the value inputed is valid for the mask.
-    -   _credit-card_: return true if the mask is complete.
-    -   _cpf_: return true if the mask is complete and cpf is valid.
-    -   _cnpj_: return true if the mask is complete and cnpj is valid.
-    -   _zip-code_: return true if the mask is complete.
-    -   _only-numbers_: always returns true.
-    -   _money_: always returns true.
-    -   _cel-phone_: return true if the mask is complete.
-    -   _datetime_: return true if the date value is valid for format.
-    -   _custom_: use custom validation, if it not exist, always returns true.
--   `getRawValue()`: get the converted value of mask.
-    -   _credit-card_: return the array with the value parts. Ex: `1234 1234 1234 1234` returns `[1234, 1234, 1234, 1234]`.
-    -   _cpf_: return the value without mask.
-    -   _cnpj_: return the value without mask.
-    -   _zip-code_: return the value without mask.
-    -   _only-numbers_: return the value without mask.
-    -   _money_: return the Number value. Ex: `R$ 1.234,56` returns `1234.56`.
-    -   _cel-phone_: return the value without mask.
-    -   _datetime_: return the `moment` object for the date and format.
-    -   _custom_: use custom method (passed in options). If it not exists, returns the current value.
-
-Sample usage:
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/Money.js)):
 
 ```jsx
-import React, { Component } from 'react'
-import { StyleSheet, View } from 'react-native'
-import { TextInputMask } from 'react-native-masked-text'
+// SIMPLE
+<TextInputMask
+  type={'money'}
+  value={this.state.simple}
+  onChangeText={text => {
+    this.setState({
+      simple: text
+    })
+  }}
+/>
 
-export default class App extends Component {
-    state = {
-        datetime: ''
-    }
-    render() {
-        return (
-            <View style={styles.container}>
-                <TextInputMask
-                    {/*First, set the reference*/}
-                    ref={ref => (this._myDatetimeField = ref)}
-                    style={styles.input}
-                    type={'datetime'}
-                    options={{
-                        format: 'DD-MM-YYYY HH:mm:ss'
-                    }}
-                    placeholder={'datetime DD-MM-YYYY HH:mm:ss'}
-                    value={this.state.datetime}
-                    onChangeText={datetime => {
-                        this.setState({ datetime })
-
-                        // Now just use =)
-                        console.log(this._myDatetimeField.getElement())
-                        console.log(this._myDatetimeField.isValid())
-                        console.log(this._myDatetimeField.getRawValue())
-                    }}
-                />
-            </View>
-        )
-    }
-}
+// ADVANCED
+<TextInputMask
+  type={'money'}
+  options={{
+    precision: 2,
+    separator: ',',
+    delimiter: '.',
+    unit: 'R$',
+    suffixUnit: ''
+  }}
+  value={this.state.advanced}
+  onChangeText={text => {
+    this.setState({
+      advanced: text
+    })
+  }}
+/>
+```
 
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        justifyContent: 'center',
-        alignItems: 'center',
-        backgroundColor: '#F5FCFF'
-    },
-    input: {
-        height: 50,
-        width: '80%',
-        borderColor: 'steelblue',
-        borderWidth: 2
-    }
-})
+#### Options
+
+| name       | type    | required | default              | description |
+| ---------- | ------- | -------- | -------------------- | ----------- |
+| precision | number | no | `2` | The number of cents to show |
+| separator | string | no | `,` | The cents separator |
+| delimiter | string | no | `.` | The thousand separator |
+| unit | string | no | `R$` | The prefix text |
+| suffixUnit | string | no | `''` | The sufix text |
+
+
+#### Methods
+
+You can get the `number` value of the mask calling the `getRawValue` method:
+
+```jsx
+<TextInputMask
+  type={'money'}
+  value={this.state.simple}
+  onChangeText={text => {
+    this.setState({
+      simple: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.moneyField = ref}
+/>
+
+const numberValue = this.moneyField.getRawValue()
+console.log(numberValue) // Number
+
+// CAUTION: the javascript do not support giant numbers.
+// so, if you have a big number in this mask, you could have problems with the value...
 ```
 
+
+### Only Numbers
+
+Mask: `accept only numbers`
+
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/ZipCode.js)):
+
+
+```jsx
+<TextInputMask
+  type={'only-numbers'}
+  value={this.state.value}
+  onChangeText={text => {
+    this.setState({
+      value: text
+    })
+  }}
+/>
+```
+
+
+### Zip Code
+
+Mask: `99999-999`
+
+Sample code ([source](https://github.com/benhurott/react-native-masked-text-samples/blob/master/ReactNativeMaskedTextSamples/Samples/OnlyNumbers.js)):
+
+
+```jsx
+<TextInputMask
+  type={'zip-code'}
+  value={this.state.value}
+  onChangeText={text => {
+    this.setState({
+      value: text
+    })
+  }}
+/>
+```
+
+#### Methods
+
+You can get the `unmasked` value using the `getRawValue` method:
+
+```jsx
+<TextInputMask
+  type={'zip-code'}
+  value={this.state.value}
+  onChangeText={text => {
+    this.setState({
+      value: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.zipCodeField = ref}
+/>
+
+//...
+
+const unmasked = this.zipCodeField.getRawValue()
+// in the mask: 98765-321
+// unmasked: 98765321
+```
+
+
+
+### ... Utils
+
+#### Getting the `TextInput` instance
+If you want to get the `TextInput` raw component, use the `getElement()` method:
+
+```jsx
+<TextInputMask
+  type={'zip-code'}
+  value={this.state.value}
+  onChangeText={text => {
+    this.setState({
+      value: text
+    })
+  }}
+  // add the ref to a local var
+  ref={(ref) => this.zipCodeField = ref}
+/>
+
+//...
+
+const textInput = this.zipCodeField.getElement()
+```
+
+#### Code Samples
+
+If you want, you can check the code samples in this repo:
+
+[react-native-masked-text-samples](https://github.com/benhurott/react-native-masked-text-samples)
+
 ## Usage (TextMask)
 
 ```jsx
diff --git a/README.old.md b/README.old.md
new file mode 100644
index 00000000..64196711
--- /dev/null
+++ b/README.old.md
@@ -0,0 +1,490 @@
+# react-native-masked-text
+
+![downloads](https://img.shields.io/npm/dt/react-native-masked-text.svg)
+[![Help Contribute to Open Source](https://www.codetriage.com/benhurott/react-native-masked-text/badges/users.svg)](https://www.codetriage.com/benhurott/react-native-masked-text)
+
+![logo](docs/res/logo.png)
+
+This is a simple masked text (normal text and input text) component for React-Native.
+
+## Supported Versions
+
+React-native: 0.32.0 or higher
+
+## Install
+
+`npm install react-native-masked-text --save`
+
+## Usage (TextInputMask)
+
+```jsx
+import React, { Component } from 'react'
+
+// import the component
+import { TextInputMask } from 'react-native-masked-text'
+
+export default class MyComponent extends Component {
+	constructor(props) {
+		super(props)
+	}
+
+	componentDidMount() {
+		// isValid method returns if the inputed value is valid.
+		// Ex: if you input 40/02/1990 30:20:20, it will return false
+		//	   because in this case, the day and the hour is invalid.
+		let valid = this.myDateText.isValid();
+
+		// get converted value. Using type=datetime, it returns the moment object.
+		// If it's using type=money, it returns a Number object.
+		let rawValue = this.myDateText.getRawValue();
+	}
+
+	render() {
+		// the type is required but options is required only for some specific types.
+		return (
+			<TextInputMask
+				ref={(ref) => this.myDateText = ref}
+				type={'datetime'}
+				options={{
+					format: 'DD-MM-YYYY HH:mm:ss'
+				}}
+			/>
+		)
+	}
+}
+```
+
+### Props
+
+#### type
+
+_credit-card_: use the mask 9999 9999 9999 9999. It accepts options (see later in this doc). <br />
+_cpf_: use the mask `999.999.999-99` and `numeric` keyboard. <br />
+_cnpj_: use the mask `99.999.999/9999-99` and `numeric` keyboard. <br />
+_zip-code_: use the mask `99999-999` and `numeric` keyboard. <br />
+_only-numbers_: accept only numbers on field with `numeric` keyboard. <br />
+_money_: use the mask `R$ 0,00` on the field with `numeric` keyboard. It accepts options (see later in this doc). <br />
+_cel-phone_: use the mask `(99) 9999-9999` or `(99) 99999-9999` (changing automaticaly by length). It accepts options (see later in this doc). <br />
+_datetime_: use datetime mask with moment format (default DD/MM/YYYY HH:mm:ss). It accepts options (see later in this doc). <br />
+_custom_: use your custom mask (see the options props later in this doc). <br />
+
+#### onChangeText
+
+Invoked after new value applied to mask.
+
+```jsx
+/**
+ * @param {String} text the text AFTER mask is applied.
+*/
+onChangeText(text) {
+	// ...
+}
+
+<TextInputMask
+	type={'only-numbers'}
+	onChangeText={this.onChangeText.bind(this)} />
+```
+
+#### checkText
+
+Allow you to check and prevent value to be inputed.
+
+```jsx
+/**
+ * @param {String} previous the previous text in the masked field.
+ * @param {String} next the next text that will be setted to field.
+ * @return {Boolean} return true if must accept the value.
+*/
+checkText(previous, next) {
+	return next === 'your valid value or other boolean condition';
+}
+
+<TextInputMask
+	type={'only-numbers'}
+	checkText={this.checkText.bind(this)} />
+```
+
+#### customTextInput
+
+You can use this prop if you want custom text input instead native TextInput component:
+
+```jsx
+const Textfield = MKTextField.textfield()
+  .withPlaceholder('Text...')
+  .withStyle(styles.textfield)
+  .build();
+
+
+<TextInputMask
+	ref={(ref) => this.myDateText = ref}
+	type={'money'}
+	style={styles.input}
+	customTextInput={Textfield}
+	placeholder="Enter text to see events"
+/>
+```
+
+#### customTextInputProps
+
+Some custom inputs like [react-native-textinput-effects](https://github.com/halilb/react-native-textinput-effects) have to set properties in mount time. For these types of components we use this property.
+
+```jsx
+import React from 'react'
+import { StyleSheet, View } from 'react-native'
+
+import { TextInputMask } from 'react-native-masked-text'
+import { Kaede } from 'react-native-textinput-effects'
+
+export default class App extends React.Component {
+  constructor(props) {
+    super(props)
+
+    this.state = {
+      birthday: ''
+    }
+  }
+
+  render() {
+    return (
+      <View style={styles.container}>
+        <TextInputMask
+          ref={(ref) => this.myDateText = ref}
+          // here we set the custom component and their props.
+          customTextInput={Kaede}
+          customTextInputProps={{
+            style:{ width: '80%' },
+            label:'Birthday'
+          }}
+
+          type={'datetime'}
+          options={{
+            format: 'DD-MM-YYYY HH:mm:ss'
+          }}
+
+          // don't forget: the value and state!
+          onChangeText={birthday => this.setState({ birthday })}
+          value={this.state.birthday} />
+      </View>
+    );
+  }
+}
+
+const styles = StyleSheet.create({
+	container: {
+		flex: 1,
+		backgroundColor: '#fff',
+		alignItems: 'center',
+		justifyContent: 'center'
+	}
+})
+```
+
+#### TextInput Props
+
+You can use the native props of TextInput, with this in mind:
+
+-   onChangeText is intercepted by component.
+-   value is intercepted by component.
+-   if you pass keyboardType, it will override the keyboardType of masked component.
+
+#### TextInput Methods
+
+If you want to use the methods of the native TextInput, use the `getElement()` method:
+
+```jsx
+export default class App extends React.Component {
+    onGoFocus() {
+        // when you call getElement method, the instance of native TextInput will returned.
+        this._myTextInputMask.getElement().focus()
+    }
+
+    render() {
+        return (
+            <View style={styles.container}>
+                <View>
+                    <TextInputMask
+                        ref={ref => (this._myTextInputMask = ref)}
+                        type={'only-numbers'}
+                        style={styles.input}
+                    />
+                </View>
+                <View>
+                    <Button
+                        onPress={this.onGoFocus.bind(this)}
+                        title="Go Focus Hue"
+                        color="#841584"
+                    />
+                </View>
+            </View>
+        )
+    }
+}
+```
+
+#### Options
+
+Some types accept options, use it like this: `<TextInputMask type={'money'} options={{ unit: 'US$' }} />`
+
+**For `type={'money'}`** <br />
+
+-   _options={...}_
+    -   `precision` (Number, default 2): the decimal places.
+    -   `separator` (String, default ','): the decimal separator.
+    -   `delimiter` (String, default '.'): the thousand separator.
+    -   `unit`: (String, default 'R$'): the prefix text.
+    -   `suffixUnit` (String, default ''): the suffix text.
+    -   `zeroCents` (Boolean, default false): if must show cents.
+
+**For `type={'cel-phone'}`** <br />
+
+-   _options={...}_
+    -   `withDDD` (Boolean, default true): if the ddd will be include in the mask.
+    -   `dddMask` (String, default '(99) '): the default mask applied if `withDDD` is true.
+
+**For `type={'datetime'}`** <br />
+
+-   _options={...}_
+    -   `format` (String, default DD/MM/YYYY HH:mm:ss): moment date format. It accepts the following:
+    -   DD/MM/YYYY HH:mm:ss
+    -   DD/MM/YYYY
+    -   MM/DD/YYYY
+    -   YYYY/MM/DD
+    -   HH:mm:ss
+    -   HH:mm
+    -   HH
+    -   _You can use all of dates with `-` instead of `/` if you want_
+
+**For `type={'custom'}`** <br />
+
+-   _options={...}_
+
+```jsx
+{
+	/**
+	 * mask: (String | required | default '')
+	 * the mask pattern
+	 * 9 - accept digit.
+	 * A - accept alpha.
+	 * S - accept alphanumeric.
+	 * * - accept all, EXCEPT white space.
+	*/
+	mask: '999#AAA',
+
+	/**
+	 * validator: (Function | optional | defaults returns true)
+	 * use this funcion to inform if the inputed value is a valid value (for invalid phone numbers, for example). The isValid method use this validator.
+	*/
+	validator: function(value, settings) {
+		return true
+	},
+	/**
+	 * getRawValue: (Function | optional | defaults return current masked value)
+	 * use this function to parse and return values to use what you want.
+	 * for example, if you want to create a phone number mask (999) 999-99-99 but want to get only
+	 * the numbers for value, use this method for this parse step.
+	*/
+	getRawValue: function(value, settings) {
+		return 'my converted value';
+	},
+	/**
+	 * translation: (Object | optional | defaults 9, A, S, *)
+	 * the dictionary that translate mask and value.
+	 * you can change defaults by simple override the key (9, A, S, *) or create some new.
+	*/
+	translation: {
+		// this is a custom translation. The others (9, A, S, *) still works.
+		// this translation will be merged and turns into 9, A, S, *, #.
+		'#': function(val) {
+			if (val === ' ') {
+				return val;
+			}
+
+			// if returns null, undefined or '' (empty string), the value will be ignored.
+			return null;
+		},
+		// in this case, we will override build-in * translation (allow all characters)
+		// and set this to allow only blank spaces and some special characters.
+		'*': function(val) {
+			return [' ', '#', ',', '.', '!'].indexOf(val) >= 0 ? val : null;
+		}
+	}
+}
+```
+
+**For `type={'credit-card'}`** <br />
+
+-   _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.
+-   `isValid()`: if the value inputed is valid for the mask.
+    -   _credit-card_: return true if the mask is complete.
+    -   _cpf_: return true if the mask is complete and cpf is valid.
+    -   _cnpj_: return true if the mask is complete and cnpj is valid.
+    -   _zip-code_: return true if the mask is complete.
+    -   _only-numbers_: always returns true.
+    -   _money_: always returns true.
+    -   _cel-phone_: return true if the mask is complete.
+    -   _datetime_: return true if the date value is valid for format.
+    -   _custom_: use custom validation, if it not exist, always returns true.
+-   `getRawValue()`: get the converted value of mask.
+    -   _credit-card_: return the array with the value parts. Ex: `1234 1234 1234 1234` returns `[1234, 1234, 1234, 1234]`.
+    -   _cpf_: return the value without mask.
+    -   _cnpj_: return the value without mask.
+    -   _zip-code_: return the value without mask.
+    -   _only-numbers_: return the value without mask.
+    -   _money_: return the Number value. Ex: `R$ 1.234,56` returns `1234.56`.
+    -   _cel-phone_: return the value without mask.
+    -   _datetime_: return the `moment` object for the date and format.
+    -   _custom_: use custom method (passed in options). If it not exists, returns the current value.
+
+Sample usage:
+
+```jsx
+import React, { Component } from 'react'
+import { StyleSheet, View } from 'react-native'
+import { TextInputMask } from 'react-native-masked-text'
+
+export default class App extends Component {
+    state = {
+        datetime: ''
+    }
+    render() {
+        return (
+            <View style={styles.container}>
+                <TextInputMask
+                    {/*First, set the reference*/}
+                    ref={ref => (this._myDatetimeField = ref)}
+                    style={styles.input}
+                    type={'datetime'}
+                    options={{
+                        format: 'DD-MM-YYYY HH:mm:ss'
+                    }}
+                    placeholder={'datetime DD-MM-YYYY HH:mm:ss'}
+                    value={this.state.datetime}
+                    onChangeText={datetime => {
+                        this.setState({ datetime })
+
+                        // Now just use =)
+                        console.log(this._myDatetimeField.getElement())
+                        console.log(this._myDatetimeField.isValid())
+                        console.log(this._myDatetimeField.getRawValue())
+                    }}
+                />
+            </View>
+        )
+    }
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        backgroundColor: '#F5FCFF'
+    },
+    input: {
+        height: 50,
+        width: '80%',
+        borderColor: 'steelblue',
+        borderWidth: 2
+    }
+})
+```
+
+## Usage (TextMask)
+
+```jsx
+import React, { Component } from 'react'
+
+// import the component
+import { TextMask } from 'react-native-masked-text'
+
+export default class MyComponent extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+            text: '4567123409871234'
+        }
+    }
+
+    render() {
+        // the type is required but options is required only for some specific types.
+        // the sample below will output 4567 **** **** 1234
+        return (
+            <TextMask
+                value={this.state.text}
+                type={'credit-card'}
+                options={{
+                    obfuscated: true
+                }}
+            />
+        )
+    }
+}
+```
+
+### Props
+
+The same of _TextInputMask_, but for React-Native _Text_ component instead _TextInput_.
+<br />
+_Warning_: if the value not match the mask, it will not appear.
+
+### Methods
+
+`getElement()`: return the instance of _Text_ component.
+
+## Extra (MaskService)
+
+If you want, we expose the `MaskService`. You can use it:
+
+**Methods**
+
+-   static toMask(type, value, settings): mask a value.
+    -   `type` (String, required): the type of the mask (`cpf`, `datetime`, etc...)
+    -   `value` (String, required): the value to be masked
+    -   `settings` (Object, optional): if the mask type accepts options, pass it in the settings parameter
+-   static toRawValue(type, maskedValue, settings): get the raw value of a masked value.
+    -   `type` (String, required): the type of the mask (`cpf`, `datetime`, etc...)
+    -   `maskedValue` (String, required): the masked value to be converted in raw value
+    -   `settings` (Object, optional): if the mask type accepts options, pass it in the settings parameter
+-   static isValid(type, value, settings): validate if the mask and the value match.
+    -   `type` (String, required): the type of the mask (`cpf`, `datetime`, etc...)
+    -   `value` (String, required): the value to be masked
+    -   `settings` (Object, optional): if the mask type accepts options, pass it in the settings parameter
+-   static getMask(type, value, settings): get the mask used to mask the value
+
+Ex:
+
+```jsx
+import { MaskService } from 'react-native-masked-text'
+
+var money = MaskService.toMask('money', '123', {
+    unit: 'US$',
+    separator: '.',
+    delimiter: ','
+})
+
+// money -> US$ 1.23
+```
+
+## Throubleshooting
+
+-   If the `es2015` error throw by babel, try run `react-native start --reset-cache`
+
+## Changelog
+
+View changelog [HERE](CHANGELOG.md)
+
+## Thanks to
+
+-   <div>Icons made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div>
+
+-   Thanks to [vanilla-masker](https://github.com/BankFacil/vanilla-masker) =).
+-   Thanks to [moment](http://momentjs.com/) =).
diff --git a/__tests__/mask/money.mask.test.js b/__tests__/mask/money.mask.test.js
index b76dbb44..9b7e2362 100644
--- a/__tests__/mask/money.mask.test.js
+++ b/__tests__/mask/money.mask.test.js
@@ -113,16 +113,6 @@ test('1 suffixUnit $$$ results R$0,01', () => {
     expect(received).toBe(expected)
 })
 
-test('1 zeroCents results R$1,00', () => {
-    var mask = new MoneyMask()
-    var expected = 'R$1,00'
-    var received = mask.getValue('1', {
-        zeroCents: true
-    })
-
-    expect(received).toBe(expected)
-})
-
 test('US$ config with value 1234567 results US$12,345.67', () => {
     var mask = new MoneyMask()
     var expected = 'US$12,345.67'
@@ -159,20 +149,6 @@ test('111111 results R$1.111,11 and raw value 1111.11', () => {
     expect(receivedRawValue).toBe(expectedRawValue)
 })
 
-test('1 zeroCents results R$1,00 and raw value 1', () => {
-    var mask = new MoneyMask()
-    var expected = 'R$1,00'
-    var received = mask.getValue('1', {
-        zeroCents: true
-    })
-
-    var expectedRawValue = 1
-    var receivedRawValue = mask.getRawValue(received)
-
-    expect(received).toBe(expected)
-    expect(receivedRawValue).toBe(expectedRawValue)
-})
-
 test('111111 delimiter , results R$1,111,11 and raw value 1111.11', () => {
     var mask = new MoneyMask()
     var expected = 'R$1,111,11'
diff --git a/dist/lib/masks/cel-phone.mask.js b/dist/lib/masks/cel-phone.mask.js
index a91fe08e..9611e688 100644
--- a/dist/lib/masks/cel-phone.mask.js
+++ b/dist/lib/masks/cel-phone.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 PHONE_8_MASK='9999-9999';var PHONE_9_MASK='99999-9999';var CEL_PHONE_SETTINGS={withDDD:true,dddMask:'(99) '};var CelPhoneMask=function(_BaseMask){_inherits(CelPhoneMask,_BaseMask);function CelPhoneMask(){_classCallCheck(this,CelPhoneMask);return _possibleConstructorReturn(this,(CelPhoneMask.__proto__||Object.getPrototypeOf(CelPhoneMask)).apply(this,arguments));}_createClass(CelPhoneMask,[{key:'getValue',value:function getValue(value,settings){var cleanedValue=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',this).call(this,value);var mask=this.getMask(cleanedValue,settings);return _custom2.default.shared.getValue(cleanedValue,{mask:mask});}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){return _get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',this).call(this,maskedValue);}},{key:'validate',value:function validate(value,settings){var valueToValidate=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'getDefaultValue',this).call(this,value);valueToValidate=this.getValue(value,settings);var mask=this.getMask(value,settings);return valueToValidate.length===mask.length;}},{key:'getMask',value:function getMask(value,settings){var _this2=this;var mergedSettings=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'mergeSettings',this).call(this,CEL_PHONE_SETTINGS,settings);var numbers=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',this).call(this,value);var mask=PHONE_8_MASK;var use9DigitMask=function(){if(mergedSettings.withDDD){var numbersDDD=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',_this2).call(_this2,mergedSettings.dddMask);var remainingValueNumbers=numbers.substr(numbersDDD.length);return remainingValueNumbers.length>=9;}else{return numbers.length>=9;}}();if(use9DigitMask){mask=PHONE_9_MASK;}if(mergedSettings.withDDD){mask=''+mergedSettings.dddMask+mask;}return mask;}}],[{key:'getType',value:function getType(){return'cel-phone';}}]);return CelPhoneMask;}(_base2.default);exports.default=CelPhoneMask;
\ 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 PHONE_8_MASK='9999-9999';var PHONE_9_MASK='99999-9999';var PHONE_INTERNATIONAL='+999 999 999 999';var MASK_TYPES={BRL:'BRL',INTERNATIONAL:'INTERNATIONAL'};var CEL_PHONE_SETTINGS={maskType:MASK_TYPES.BRL,withDDD:true,dddMask:'(99) '};var CelPhoneMask=function(_BaseMask){_inherits(CelPhoneMask,_BaseMask);function CelPhoneMask(){_classCallCheck(this,CelPhoneMask);return _possibleConstructorReturn(this,(CelPhoneMask.__proto__||Object.getPrototypeOf(CelPhoneMask)).apply(this,arguments));}_createClass(CelPhoneMask,[{key:'getValue',value:function getValue(value,settings){var cleanedValue=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',this).call(this,value);var mask=this.getMask(cleanedValue,settings);return _custom2.default.shared.getValue(cleanedValue,{mask:mask});}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){return _get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',this).call(this,maskedValue);}},{key:'validate',value:function validate(value,settings){var valueToValidate=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'getDefaultValue',this).call(this,value);valueToValidate=this.getValue(value,settings);var mask=this.getMask(value,settings);return valueToValidate.length===mask.length;}},{key:'getMask',value:function getMask(value,settings){var _this2=this;var mergedSettings=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'mergeSettings',this).call(this,CEL_PHONE_SETTINGS,settings);if(mergedSettings.maskType===MASK_TYPES.INTERNATIONAL){return PHONE_INTERNATIONAL;}var numbers=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',this).call(this,value);var mask=PHONE_8_MASK;var use9DigitMask=function(){if(mergedSettings.withDDD){var numbersDDD=_get(CelPhoneMask.prototype.__proto__||Object.getPrototypeOf(CelPhoneMask.prototype),'removeNotNumbers',_this2).call(_this2,mergedSettings.dddMask);var remainingValueNumbers=numbers.substr(numbersDDD.length);return remainingValueNumbers.length>=9;}else{return numbers.length>=9;}}();if(use9DigitMask){mask=PHONE_9_MASK;}if(mergedSettings.withDDD){mask=''+mergedSettings.dddMask+mask;}return mask;}}],[{key:'getType',value:function getType(){return'cel-phone';}}]);return CelPhoneMask;}(_base2.default);exports.default=CelPhoneMask;
\ No newline at end of file
diff --git a/dist/lib/masks/money.mask.js b/dist/lib/masks/money.mask.js
index 9e6f860f..40940619 100644
--- a/dist/lib/masks/money.mask.js
+++ b/dist/lib/masks/money.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 _vanillaMasker=require('../internal-dependencies/vanilla-masker');var _vanillaMasker2=_interopRequireDefault(_vanillaMasker);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 MONEY_MASK_SETTINGS={precision:2,separator:',',delimiter:'.',unit:'R$',suffixUnit:'',zeroCents:false};var MoneyMask=function(_BaseMask){_inherits(MoneyMask,_BaseMask);function MoneyMask(){_classCallCheck(this,MoneyMask);return _possibleConstructorReturn(this,(MoneyMask.__proto__||Object.getPrototypeOf(MoneyMask)).apply(this,arguments));}_createClass(MoneyMask,[{key:'getValue',value:function getValue(value,settings,oldValue){var mergedSettings=_get(MoneyMask.prototype.__proto__||Object.getPrototypeOf(MoneyMask.prototype),'mergeSettings',this).call(this,MONEY_MASK_SETTINGS,settings);var sanitized=this._sanitize(value,mergedSettings);if(mergedSettings.suffixUnit&&oldValue&&sanitized){if(sanitized.length==oldValue.length-1){var cleared=this.removeNotNumbers(sanitized);sanitized=cleared.substr(0,cleared.length-1);}}var masked=_vanillaMasker2.default.toMoney(sanitized,mergedSettings);return masked;}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){var mergedSettings=_get(MoneyMask.prototype.__proto__||Object.getPrototypeOf(MoneyMask.prototype),'mergeSettings',this).call(this,MONEY_MASK_SETTINGS,settings);var normalized=_get(MoneyMask.prototype.__proto__||Object.getPrototypeOf(MoneyMask.prototype),'removeNotNumbers',this).call(this,maskedValue);var dotPosition=normalized.length-mergedSettings.precision;normalized=this._insert(normalized,dotPosition,'.');return Number(normalized);}},{key:'validate',value:function validate(value,settings){return true;}},{key:'_sanitize',value:function _sanitize(value,settings){if(typeof value==='number'){return value.toFixed(settings.precision);}return value;}},{key:'_insert',value:function _insert(text,index,string){if(index>0){return text.substring(0,index)+string+text.substring(index,text.length);}else{return string+text;}}}],[{key:'getType',value:function getType(){return'money';}}]);return MoneyMask;}(_base2.default);exports.default=MoneyMask;
\ 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 _vanillaMasker=require('../internal-dependencies/vanilla-masker');var _vanillaMasker2=_interopRequireDefault(_vanillaMasker);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 MONEY_MASK_SETTINGS={precision:2,separator:',',delimiter:'.',unit:'R$',suffixUnit:''};var MoneyMask=function(_BaseMask){_inherits(MoneyMask,_BaseMask);function MoneyMask(){_classCallCheck(this,MoneyMask);return _possibleConstructorReturn(this,(MoneyMask.__proto__||Object.getPrototypeOf(MoneyMask)).apply(this,arguments));}_createClass(MoneyMask,[{key:'getValue',value:function getValue(value,settings,oldValue){var mergedSettings=_get(MoneyMask.prototype.__proto__||Object.getPrototypeOf(MoneyMask.prototype),'mergeSettings',this).call(this,MONEY_MASK_SETTINGS,settings);var sanitized=this._sanitize(value,mergedSettings);if(mergedSettings.suffixUnit&&oldValue&&sanitized){if(sanitized.length==oldValue.length-1){var cleared=this.removeNotNumbers(sanitized);sanitized=cleared.substr(0,cleared.length-1);}}var masked=_vanillaMasker2.default.toMoney(sanitized,mergedSettings);return masked;}},{key:'getRawValue',value:function getRawValue(maskedValue,settings){var mergedSettings=_get(MoneyMask.prototype.__proto__||Object.getPrototypeOf(MoneyMask.prototype),'mergeSettings',this).call(this,MONEY_MASK_SETTINGS,settings);var normalized=_get(MoneyMask.prototype.__proto__||Object.getPrototypeOf(MoneyMask.prototype),'removeNotNumbers',this).call(this,maskedValue);var dotPosition=normalized.length-mergedSettings.precision;normalized=this._insert(normalized,dotPosition,'.');return Number(normalized);}},{key:'validate',value:function validate(value,settings){return true;}},{key:'_sanitize',value:function _sanitize(value,settings){if(typeof value==='number'){return value.toFixed(settings.precision);}return value;}},{key:'_insert',value:function _insert(text,index,string){if(index>0){return text.substring(0,index)+string+text.substring(index,text.length);}else{return string+text;}}}],[{key:'getType',value:function getType(){return'money';}}]);return MoneyMask;}(_base2.default);exports.default=MoneyMask;
\ No newline at end of file
diff --git a/index.d.ts b/index.d.ts
index 9f049bc9..22e5eddf 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -34,6 +34,7 @@ export interface TextInputMaskOptionProp {
     // Phone type.
     withDDD?: boolean
     dddMask?: string
+    maskType?: 'BRL' | 'INTERNATIONAL'
 
     // Datetime type.
     format?: string
diff --git a/lib/masks/cel-phone.mask.js b/lib/masks/cel-phone.mask.js
index fd0b0ec5..938b0853 100644
--- a/lib/masks/cel-phone.mask.js
+++ b/lib/masks/cel-phone.mask.js
@@ -3,7 +3,15 @@ import CustomMask from './custom.mask'
 
 const PHONE_8_MASK = '9999-9999'
 const PHONE_9_MASK = '99999-9999'
+const PHONE_INTERNATIONAL = '+999 999 999 999'
+
+const MASK_TYPES = {
+    BRL: 'BRL',
+    INTERNATIONAL: 'INTERNATIONAL'
+}
+
 const CEL_PHONE_SETTINGS = {
+    maskType: MASK_TYPES.BRL,
     withDDD: true,
     dddMask: '(99) '
 }
@@ -35,6 +43,10 @@ export default class CelPhoneMask extends BaseMask {
     getMask(value, settings) {
         let mergedSettings = super.mergeSettings(CEL_PHONE_SETTINGS, settings)
 
+        if (mergedSettings.maskType === MASK_TYPES.INTERNATIONAL) {
+            return PHONE_INTERNATIONAL
+        }
+
         let numbers = super.removeNotNumbers(value)
         let mask = PHONE_8_MASK
 
diff --git a/lib/masks/money.mask.js b/lib/masks/money.mask.js
index 8e1646e8..841ff5b2 100644
--- a/lib/masks/money.mask.js
+++ b/lib/masks/money.mask.js
@@ -6,8 +6,7 @@ const MONEY_MASK_SETTINGS = {
     separator: ',',
     delimiter: '.',
     unit: 'R$',
-    suffixUnit: '',
-    zeroCents: false
+    suffixUnit: ''
 }
 
 export default class MoneyMask extends BaseMask {
diff --git a/package.json b/package.json
index 665ffc7b..27d56c3b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.10.1",
+    "version": "1.11.0",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {