diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a079662..a8f9b743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## [1.12.4] - 2019-07-12
+
+### Fix
+
+- [#170](https://github.com/benhurott/react-native-masked-text/issues/170): fixing typing for includeRawValueInChangeText.
+    - thanks to [Sergei Butko](https://github.com/svbutko) for contribution.
+    - thanks to [Agustin G.](https://github.com/agustingabiola) for reporting.
+- [#173](https://github.com/benhurott/react-native-masked-text/issues/173): fixing initial value for money field.
+    - thanks to [Maksim Markelov](https://github.com/mmarkelov) for reporting.
+
 ## [1.12.3] - 2019-05-17
 
 ### Fix
diff --git a/dist/lib/base-text-component.js b/dist/lib/base-text-component.js
index b5094711..6334ef5f 100644
--- a/dist/lib/base-text-component.js
+++ b/dist/lib/base-text-component.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 _react=require('react');var _react2=_interopRequireDefault(_react);var _maskResolver=require('./mask-resolver');var _maskResolver2=_interopRequireDefault(_maskResolver);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 BaseTextComponent=function(_PureComponent){_inherits(BaseTextComponent,_PureComponent);function BaseTextComponent(props){_classCallCheck(this,BaseTextComponent);var _this=_possibleConstructorReturn(this,(BaseTextComponent.__proto__||Object.getPrototypeOf(BaseTextComponent)).call(this,props));_this._resolveMaskHandler();return _this;}_createClass(BaseTextComponent,[{key:'componentDidMount',value:function componentDidMount(){this._bindProps(this.props);}},{key:'componentWillReceiveProps',value:function componentWillReceiveProps(nextProps){this._bindProps(nextProps);}},{key:'updateValue',value:function updateValue(text){var maskedText=this._getMaskedValue(text);var rawText=this.props.includeRawValueInChangeText?this.getRawValueFor(maskedText):undefined;return{maskedText:maskedText,rawText:rawText};}},{key:'isValid',value:function isValid(){return this._maskHandler.validate(this._getDefaultValue(this.props.value),this._getOptions());}},{key:'getRawValueFor',value:function getRawValueFor(value){return this._maskHandler.getRawValue(this._getDefaultValue(value),this._getOptions());}},{key:'getRawValue',value:function getRawValue(){return this.getRawValueFor(this.props.value);}},{key:'getDisplayValueFor',value:function getDisplayValueFor(value){return this._getMaskedValue(value);}},{key:'_getOptions',value:function _getOptions(){return this.props.options;}},{key:'_mustUpdateValue',value:function _mustUpdateValue(newValue){return this.props.value!==newValue;}},{key:'_resolveMaskHandler',value:function _resolveMaskHandler(){this._maskHandler=_maskResolver2.default.resolve(this.props.type);}},{key:'_bindProps',value:function _bindProps(nextProps){if(this.props.type!==nextProps.type){this._resolveMaskHandler();}}},{key:'_getDefaultMaskedValue',value:function _getDefaultMaskedValue(value){if(this._getDefaultValue(value)===''){return'';}return this._getMaskedValue(value);}},{key:'_getMaskedValue',value:function _getMaskedValue(value){return this._maskHandler.getValue(this._getDefaultValue(value),this._getOptions());}},{key:'_getDefaultValue',value:function _getDefaultValue(value){if(value===undefined||value===null){return'';}return value;}}]);return BaseTextComponent;}(_react.PureComponent);exports.default=BaseTextComponent;
\ 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 _react=require('react');var _react2=_interopRequireDefault(_react);var _maskResolver=require('./mask-resolver');var _maskResolver2=_interopRequireDefault(_maskResolver);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 BaseTextComponent=function(_PureComponent){_inherits(BaseTextComponent,_PureComponent);function BaseTextComponent(props){_classCallCheck(this,BaseTextComponent);var _this=_possibleConstructorReturn(this,(BaseTextComponent.__proto__||Object.getPrototypeOf(BaseTextComponent)).call(this,props));_this._resolveMaskHandler();return _this;}_createClass(BaseTextComponent,[{key:'componentDidMount',value:function componentDidMount(){this._bindProps(this.props);}},{key:'componentWillReceiveProps',value:function componentWillReceiveProps(nextProps){this._bindProps(nextProps);}},{key:'updateValue',value:function updateValue(text){var maskedText=this._getMaskedValue(text);var rawText=this.props.includeRawValueInChangeText?this.getRawValueFor(maskedText):undefined;return{maskedText:maskedText,rawText:rawText};}},{key:'isValid',value:function isValid(){return this._maskHandler.validate(this._getDefaultValue(this.props.value),this._getOptions());}},{key:'getRawValueFor',value:function getRawValueFor(value){return this._maskHandler.getRawValue(this._getDefaultValue(value),this._getOptions());}},{key:'getRawValue',value:function getRawValue(){return this.getRawValueFor(this.props.value);}},{key:'getDisplayValueFor',value:function getDisplayValueFor(value){return this._getMaskedValue(value);}},{key:'_getOptions',value:function _getOptions(){return this.props.options;}},{key:'_mustUpdateValue',value:function _mustUpdateValue(newValue){return this.props.value!==newValue;}},{key:'_resolveMaskHandler',value:function _resolveMaskHandler(){this._maskHandler=_maskResolver2.default.resolve(this.props.type);}},{key:'_bindProps',value:function _bindProps(nextProps){if(this.props.type!==nextProps.type){this._resolveMaskHandler();}}},{key:'_getDefaultMaskedValue',value:function _getDefaultMaskedValue(value){if(this._getDefaultValue(value)===''){return'';}return this._getMaskedValue(value);}},{key:'_getMaskedValue',value:function _getMaskedValue(value){var defaultValue=this._getDefaultValue(value);if(defaultValue===''){return'';}return this._maskHandler.getValue(defaultValue,this._getOptions());}},{key:'_getDefaultValue',value:function _getDefaultValue(value){if(value===undefined||value===null){return'';}return value;}}]);return BaseTextComponent;}(_react.PureComponent);exports.default=BaseTextComponent;
\ No newline at end of file
diff --git a/index.d.ts b/index.d.ts
index bafb1055..8c831e9a 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -48,9 +48,6 @@ export interface TextInputMaskOptionProp {
     validator?: (value: string, settings: TextInputMaskOptionProp) => boolean
     getRawValue?: (value: string, settings: TextInputMaskOptionProp) => any
     translation?: { [s: string]: (val: string) => string | null | undefined }
-
-    // Options
-    includeRawValueInChangeText?: boolean
 }
 
 // TextInputMask Props
@@ -62,6 +59,7 @@ export interface TextInputMaskProps extends Pick<TextInputProps, Exclude<keyof T
     refInput?: (ref: any) => void
     customTextInput?: any
     customTextInputProps?: Object
+    includeRawValueInChangeText?: boolean
 }
 
 // TextInputMask Component
diff --git a/lib/base-text-component.js b/lib/base-text-component.js
index a9a8a467..cd87314b 100644
--- a/lib/base-text-component.js
+++ b/lib/base-text-component.js
@@ -74,8 +74,13 @@ export default class BaseTextComponent extends PureComponent {
     }
 
     _getMaskedValue(value) {
+        const defaultValue = this._getDefaultValue(value)
+        if (defaultValue === '') {
+            return ''
+        }
+
         return this._maskHandler.getValue(
-            this._getDefaultValue(value),
+            defaultValue,
             this._getOptions());
     }
 
diff --git a/package.json b/package.json
index 1060d91f..33f1b690 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.12.3",
+    "version": "1.12.4",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {