diff --git a/README.md b/README.md
index 8f70fce..3aad925 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Or view it online [here](https://appetize.io/app/hyp1m20y515c16cj5yw2karcjg)! (C
 ## Installation
 
 ```
-npm i react-native-material-design --save
+npm i @doramong0926/react-native-material-design --save
 ```
 
 Follow the [Android installation instructions](https://github.com/oblador/react-native-vector-icons#android) on the [react-native-vector-icons](https://github.com/oblador/react-native-vector-icons) library, which consists of adding the following to your `./android/app/build.gradle`:
diff --git a/lib/Avatar.js b/lib/Avatar.js
index 1126c16..0a80ca8 100644
--- a/lib/Avatar.js
+++ b/lib/Avatar.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View, Image, Text} from "react-native";
 import Icon from './Icon';
 import { getColor } from './helpers';
diff --git a/lib/Button.js b/lib/Button.js
index a40efae..a1111e4 100644
--- a/lib/Button.js
+++ b/lib/Button.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {ActivityIndicator, View, Text, TouchableNativeFeedback, Platform} from "react-native";
 import Ripple from './polyfill/Ripple';
 import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
diff --git a/lib/Card/Actions.js b/lib/Card/Actions.js
index 2fe2c29..07e1c62 100644
--- a/lib/Card/Actions.js
+++ b/lib/Card/Actions.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {StyleSheet, View} from "react-native";
 
 export default class Actions extends Component {
diff --git a/lib/Card/Body.js b/lib/Card/Body.js
index 66bea89..bf2206a 100644
--- a/lib/Card/Body.js
+++ b/lib/Card/Body.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {StyleSheet, View} from "react-native";
 
 export default class Body extends Component {
diff --git a/lib/Card/Media.js b/lib/Card/Media.js
index 715bfe8..d0e90d6 100644
--- a/lib/Card/Media.js
+++ b/lib/Card/Media.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {StyleSheet, Image, View} from "react-native";
 
 export default class Media extends Component {
diff --git a/lib/Card/index.js b/lib/Card/index.js
index fed68bb..9ec30d3 100644
--- a/lib/Card/index.js
+++ b/lib/Card/index.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View, TouchableNativeFeedback} from "react-native";
 import Ripple from '../polyfill/Ripple';
 import { getColor, isCompatible } from '../helpers';
diff --git a/lib/Checkbox.js b/lib/Checkbox.js
index 5127e9c..b393329 100644
--- a/lib/Checkbox.js
+++ b/lib/Checkbox.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {StyleSheet, Text, View, TouchableHighlight} from "react-native";
 import { TYPO, PRIMARY, COLOR, PRIMARY_COLORS, THEME_NAME } from './config';
 import Icon from './Icon';
diff --git a/lib/CheckboxGroup.js b/lib/CheckboxGroup.js
index 8535dc2..c4d1948 100644
--- a/lib/CheckboxGroup.js
+++ b/lib/CheckboxGroup.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View} from "react-native";
 import Checkbox from './Checkbox';
 import { THEME_NAME, PRIMARY, PRIMARY_COLORS } from './config';
diff --git a/lib/Divider.js b/lib/Divider.js
index eb03443..0508e8c 100644
--- a/lib/Divider.js
+++ b/lib/Divider.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View} from "react-native";
 import { THEME_NAME } from './config';
 
diff --git a/lib/Drawer/Header.js b/lib/Drawer/Header.js
index b85e7af..40a1168 100644
--- a/lib/Drawer/Header.js
+++ b/lib/Drawer/Header.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View, Image} from "react-native";
 
 export default class Header extends Component {
diff --git a/lib/Drawer/Section.js b/lib/Drawer/Section.js
index 67b14f8..2aefd48 100644
--- a/lib/Drawer/Section.js
+++ b/lib/Drawer/Section.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View, Text, TouchableNativeFeedback} from "react-native";
 import Icon from '../Icon';
 import Ripple from '../polyfill/Ripple';
diff --git a/lib/Drawer/index.js b/lib/Drawer/index.js
index e97a60c..73f02c9 100644
--- a/lib/Drawer/index.js
+++ b/lib/Drawer/index.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {ScrollView} from "react-native";
 import { THEME_NAME, PRIMARY_COLORS } from '../config';
 import { getColor } from '../helpers';
diff --git a/lib/Icon.js b/lib/Icon.js
index 38f836a..0c2a87e 100644
--- a/lib/Icon.js
+++ b/lib/Icon.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View} from "react-native";
 import { getColor } from './helpers';
 import VectorIconComponent from './VectorIconComponent';
diff --git a/lib/IconToggle.js b/lib/IconToggle.js
index b5cd31c..0dde203 100644
--- a/lib/IconToggle.js
+++ b/lib/IconToggle.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {Text, View, Animated} from "react-native";
 import { getColor } from './helpers';
 
diff --git a/lib/List.js b/lib/List.js
index 22e9929..bc3a9bd 100644
--- a/lib/List.js
+++ b/lib/List.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {StyleSheet, View, Text, TouchableWithoutFeedback} from "react-native";
 import { TYPO } from './config';
 
diff --git a/lib/RadioButton.js b/lib/RadioButton.js
index 819c1d8..2bb61e4 100644
--- a/lib/RadioButton.js
+++ b/lib/RadioButton.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {StyleSheet, Text, View, TouchableHighlight} from "react-native";
 import Icon from './Icon';
 import IconToggle from './IconToggle';
diff --git a/lib/RadioButtonGroup.js b/lib/RadioButtonGroup.js
index 3f7a8ce..e3c432a 100644
--- a/lib/RadioButtonGroup.js
+++ b/lib/RadioButtonGroup.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View} from "react-native";
 import RadioButton from './RadioButton';
 import { PRIMARY, PRIMARY_COLORS, THEME_NAME } from './config';
diff --git a/lib/Ripple.js b/lib/Ripple.js
index 1afa283..68e6246 100644
--- a/lib/Ripple.js
+++ b/lib/Ripple.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View, Text, TouchableNativeFeedback} from "react-native";
 import { default as PolyfillRipple } from './polyfill/Ripple';
 import { isCompatible } from './helpers';
diff --git a/lib/Subheader.js b/lib/Subheader.js
index 5817fc9..ba070be 100644
--- a/lib/Subheader.js
+++ b/lib/Subheader.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {StyleSheet, View, Text} from "react-native";
 import { TYPO, THEME_NAME } from './config';
 import { getColor } from './helpers';
diff --git a/lib/Toolbar.js b/lib/Toolbar.js
index d28c51c..5a846af 100644
--- a/lib/Toolbar.js
+++ b/lib/Toolbar.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View, Text} from "react-native";
 import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
 import { getColor } from './helpers';
diff --git a/lib/polyfill/Ripple.js b/lib/polyfill/Ripple.js
index 4e41e9c..0c1ac4f 100644
--- a/lib/polyfill/Ripple.js
+++ b/lib/polyfill/Ripple.js
@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from "react";
+import React, {Component} from "react"; import PropTypes from 'prop-types';
 import {View, Animated, TouchableOpacity, Platform} from "react-native";
 
 import elevationPolyfill from './Elevation';
diff --git a/package.json b/package.json
index 83985a4..1b787de 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,11 @@
 {
-  "name": "react-native-material-design",
-  "version": "0.3.8",
-  "description": "React Native Material Design Components",
+  "name": "@doramong0926/react-native-material-design",
+  "version": "1.0.0",
+  "description": "Fork React Native Material Design Components for propTypes issue",
   "main": "lib/index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "lint": "./node_modules/.bin/eslint ./lib"
-  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/react-native-material-design/react-native-material-design"
+    "url": "git+https://github.com/doramong0926/react-native-material-design.git"
   },
   "keywords": [
     "react-native",
@@ -22,9 +18,9 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/react-native-material-design/react-native-material-design/issues"
+    "url": "https://github.com/doramong0926/react-native-material-design"
   },
-  "homepage": "https://github.com/react-native-material-design/react-native-material-design",
+  "homepage": "https://github.com/doramong0926/react-native-material-design",
   "dependencies": {
     "react-native-material-design-styles": "git+https://github.com/react-native-material-design/react-native-material-design-styles.git",
     "react-native-vector-icons": "^2.0.1"
@@ -33,5 +29,12 @@
     "babel-eslint": "^4.1.6",
     "eslint": "^1.6.0",
     "eslint-plugin-react": "^3.5.1"
+  },
+  "directories": {
+    "lib": "lib"
+  },
+  "author": "doramong0926",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
   }
 }