diff --git a/dist/Chart.js b/dist/Chart.js
index e034594..8380d42 100644
--- a/dist/Chart.js
+++ b/dist/Chart.js
@@ -1,5 +1,7 @@
 
 'use strict';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 _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 _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
+
 var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _reactNative=require('react-native');
 var _BarChart=require('./BarChart');var _BarChart2=_interopRequireDefault(_BarChart);
@@ -238,61 +240,61 @@ maxVerticalBound:_this2.state.bounds.max}))));
 }}]);return Chart;}(_react.Component);Chart.defaultProps={data:[[]],animated:true,animationDuration:300,axisColor:C.BLACK,axisLabelColor:C.BLACK,axisLineWidth:1,axisTitleColor:C.GREY,axisTitleFontSize:16,chartFontSize:14,color:[],dataPointRadius:3,gridColor:C.BLACK,gridLineWidth:0.5,hideHorizontalGridLines:false,hideVerticalGridLines:false,horizontalScale:1,labelFontSize:10,lineWidth:1,showAxis:true,showDataPoint:false,showGrid:true,showXAxisLabels:true,showYAxisLabels:true,tightBounds:false,verticalGridStep:4,xAxisHeight:20,yAxisWidth:30,yAxisUseDecimal:false,yAxisShortLabel:false};exports.default=Chart;
 
 
-var colorType=_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]);
+var colorType=_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string]);
 
 Chart.propTypes={
 
 
-type:_react.PropTypes.oneOf(['line','bar','pie']).isRequired,
-highlightColor:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),
-highlightIndices:_react.PropTypes.arrayOf(_react.PropTypes.number),
-onDataPointPress:_react.PropTypes.func,
-yAxisUseDecimal:_react.PropTypes.bool,
-yAxisShortLabel:_react.PropTypes.bool,
+type:_propTypes2.default.oneOf(['line','bar','pie']).isRequired,
+highlightColor:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string]),
+highlightIndices:_propTypes2.default.arrayOf(_propTypes2.default.number),
+onDataPointPress:_propTypes2.default.func,
+yAxisUseDecimal:_propTypes2.default.bool,
+yAxisShortLabel:_propTypes2.default.bool,
 
 
-color:_react.PropTypes.arrayOf(_react.PropTypes.oneOfType([colorType,_react.PropTypes.arrayOf(colorType)])),
-cornerRadius:_react.PropTypes.number,
+color:_propTypes2.default.arrayOf(_propTypes2.default.oneOfType([colorType,_propTypes2.default.arrayOf(colorType)])),
+cornerRadius:_propTypes2.default.number,
 
-widthPercent:_react.PropTypes.number,
+widthPercent:_propTypes2.default.number,
 
 
-fillColor:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),
-dataPointColor:_react.PropTypes.arrayOf(_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string])),
-dataPointFillColor:_react.PropTypes.arrayOf(_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string])),
-dataPointRadius:_react.PropTypes.number,
+fillColor:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string]),
+dataPointColor:_propTypes2.default.arrayOf(_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string])),
+dataPointFillColor:_propTypes2.default.arrayOf(_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string])),
+dataPointRadius:_propTypes2.default.number,
 
-lineWidth:_react.PropTypes.number,
-showDataPoint:_react.PropTypes.bool,
+lineWidth:_propTypes2.default.number,
+showDataPoint:_propTypes2.default.bool,
 
 
 
-sliceColors:_react.PropTypes.arrayOf(_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string])),
-animationDuration:_react.PropTypes.number,
-axisColor:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),
-axisLabelColor:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),
-axisLineWidth:_react.PropTypes.number,
+sliceColors:_propTypes2.default.arrayOf(_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string])),
+animationDuration:_propTypes2.default.number,
+axisColor:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string]),
+axisLabelColor:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string]),
+axisLineWidth:_propTypes2.default.number,
 
 
 
 
 
-gridColor:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),
-gridLineWidth:_react.PropTypes.number,
-hideHorizontalGridLines:_react.PropTypes.bool,
-hideVerticalGridLines:_react.PropTypes.bool,
+gridColor:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string]),
+gridLineWidth:_propTypes2.default.number,
+hideHorizontalGridLines:_propTypes2.default.bool,
+hideVerticalGridLines:_propTypes2.default.bool,
 
-showAxis:_react.PropTypes.bool,
-showGrid:_react.PropTypes.bool,
-showXAxisLabels:_react.PropTypes.bool,
-showYAxisLabels:_react.PropTypes.bool,
-style:_react.PropTypes.any,
-tightBounds:_react.PropTypes.bool,
-verticalGridStep:_react.PropTypes.number,
-horizontalGridStep:_react.PropTypes.number,
+showAxis:_propTypes2.default.bool,
+showGrid:_propTypes2.default.bool,
+showXAxisLabels:_propTypes2.default.bool,
+showYAxisLabels:_propTypes2.default.bool,
+style:_propTypes2.default.any,
+tightBounds:_propTypes2.default.bool,
+verticalGridStep:_propTypes2.default.number,
+horizontalGridStep:_propTypes2.default.number,
 
-xAxisHeight:_react.PropTypes.number,
-xAxisTransform:_react.PropTypes.func,
+xAxisHeight:_propTypes2.default.number,
+xAxisTransform:_propTypes2.default.func,
 
-yAxisTransform:_react.PropTypes.func,
-yAxisWidth:_react.PropTypes.number};
\ No newline at end of file
+yAxisTransform:_propTypes2.default.func,
+yAxisWidth:_propTypes2.default.number};
\ No newline at end of file
diff --git a/dist/Circle.js b/dist/Circle.js
index 0bf0256..6c1f30a 100644
--- a/dist/Circle.js
+++ b/dist/Circle.js
@@ -1,4 +1,6 @@
 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 _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
+
 var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _reactNative=require('react-native');
 
@@ -25,4 +27,4 @@ var path=new Path().moveTo(x,y-radius).arc(0,radius*2,radius).arc(0,radius*-2,ra
 return(
 _react2.default.createElement(Shape,{d:path,stroke:this.props.stroke,fill:this.props.fill,strokeWidth:1}));
 
-}}]);return Circle;}(_react.Component);Circle.propTypes={radius:_react.PropTypes.number.isRequired,x:_react.PropTypes.number.isRequired,y:_react.PropTypes.number.isRequired,onPress:_react.PropTypes.func,fill:_react.PropTypes.string,stroke:_react.PropTypes.string};Circle.defaultProps={onPress:function onPress(){},radius:2,fill:C.BLACK,stroke:C.BLACK};exports.default=Circle;
\ No newline at end of file
+}}]);return Circle;}(_react.Component);Circle.propTypes={radius:_propTypes2.default.number.isRequired,x:_propTypes2.default.number.isRequired,y:_propTypes2.default.number.isRequired,onPress:_propTypes2.default.func,fill:_propTypes2.default.string,stroke:_propTypes2.default.string};Circle.defaultProps={onPress:function onPress(){},radius:2,fill:C.BLACK,stroke:C.BLACK};exports.default=Circle;
\ No newline at end of file
diff --git a/dist/Grid.js b/dist/Grid.js
index f289654..d1dd08b 100644
--- a/dist/Grid.js
+++ b/dist/Grid.js
@@ -1,4 +1,5 @@
-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);
+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 _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
+var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _reactNative=require('react-native');
 var _util=require('./util');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
 
@@ -74,4 +75,4 @@ verticalRange.map(function(_,i){return _react2.default.createElement(_reactNativ
 }()));
 
 
-}}]);return Grid;}(_react.Component);Grid.propTypes={showGrid:_react.PropTypes.bool,data:_react.PropTypes.arrayOf(_react.PropTypes.arrayOf(_react.PropTypes.array)).isRequired,verticalGridStep:_react.PropTypes.number.isRequired,horizontalGridStep:_react.PropTypes.number,gridLineWidth:_react.PropTypes.number,gridColor:_react.PropTypes.oneOfType([_react.PropTypes.number,_react.PropTypes.string]),hideHorizontalGridLines:_react.PropTypes.bool,hideVerticalGridLines:_react.PropTypes.bool,height:_react.PropTypes.number,width:_react.PropTypes.number,type:_react.PropTypes.oneOf(['line','bar','pie']).isRequired};Grid.defaultProps={};exports.default=Grid;
\ No newline at end of file
+}}]);return Grid;}(_react.Component);Grid.propTypes={showGrid:_propTypes2.default.bool,data:_propTypes2.default.arrayOf(_propTypes2.default.arrayOf(_propTypes2.default.array)).isRequired,verticalGridStep:_propTypes2.default.number.isRequired,horizontalGridStep:_propTypes2.default.number,gridLineWidth:_propTypes2.default.number,gridColor:_propTypes2.default.oneOfType([_propTypes2.default.number,_propTypes2.default.string]),hideHorizontalGridLines:_propTypes2.default.bool,hideVerticalGridLines:_propTypes2.default.bool,height:_propTypes2.default.number,width:_propTypes2.default.number,type:_propTypes2.default.oneOf(['line','bar','pie']).isRequired};Grid.defaultProps={};exports.default=Grid;
\ No newline at end of file
diff --git a/dist/Wedge.js b/dist/Wedge.js
index 9325254..da5222d 100644
--- a/dist/Wedge.js
+++ b/dist/Wedge.js
@@ -22,6 +22,8 @@ Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.ass
 
 
 
+
+var _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
 
 var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _reactNative=require('react-native');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
@@ -181,4 +183,4 @@ path=this._createArcPath(originX,originY,startAngle,endAngle,or,ir);
 }
 
 return _react2.default.createElement(Shape,_extends({},this.props,{d:path}));
-}}]);return Wedge;}(_react.Component);Wedge.propTypes={outerRadius:_react.PropTypes.number.isRequired,startAngle:_react.PropTypes.number.isRequired,endAngle:_react.PropTypes.number.isRequired,originX:_react.PropTypes.number.isRequired,originY:_react.PropTypes.number.isRequired,innerRadius:_react.PropTypes.number};exports.default=Wedge;
\ No newline at end of file
+}}]);return Wedge;}(_react.Component);Wedge.propTypes={outerRadius:_propTypes2.default.number.isRequired,startAngle:_propTypes2.default.number.isRequired,endAngle:_propTypes2.default.number.isRequired,originX:_propTypes2.default.number.isRequired,originY:_propTypes2.default.number.isRequired,innerRadius:_propTypes2.default.number};exports.default=Wedge;
\ No newline at end of file
diff --git a/dist/xAxis.js b/dist/xAxis.js
index 2ce75f7..5640769 100644
--- a/dist/xAxis.js
+++ b/dist/xAxis.js
@@ -1,5 +1,7 @@
 
 'use strict';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 _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
+
 var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _reactNative=require('react-native');
 var _util=require('./util');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;}
@@ -79,4 +81,4 @@ item));
 }()));
 
 
-}}]);return XAxis;}(_react.Component);XAxis.propTypes={axisColor:_react.PropTypes.any.isRequired,axisLabelColor:_react.PropTypes.any.isRequired,axisLineWidth:_react.PropTypes.number.isRequired,data:_react.PropTypes.arrayOf(_react.PropTypes.arrayOf(_react.PropTypes.array)).isRequired,showXAxisLabels:_react.PropTypes.bool.isRequired,style:_react.PropTypes.any,width:_react.PropTypes.number.isRequired,align:_react.PropTypes.string,labelFontSize:_react.PropTypes.number.isRequired,xAxisTransform:_react.PropTypes.func,horizontalGridStep:_react.PropTypes.number};XAxis.defaultProps={align:'center'};exports.default=XAxis;
\ No newline at end of file
+}}]);return XAxis;}(_react.Component);XAxis.propTypes={axisColor:_propTypes2.default.any.isRequired,axisLabelColor:_propTypes2.default.any.isRequired,axisLineWidth:_propTypes2.default.number.isRequired,data:_propTypes2.default.arrayOf(_propTypes2.default.arrayOf(_propTypes2.default.array)).isRequired,showXAxisLabels:_propTypes2.default.bool.isRequired,style:_propTypes2.default.any,width:_propTypes2.default.number.isRequired,align:_propTypes2.default.string,labelFontSize:_propTypes2.default.number.isRequired,xAxisTransform:_propTypes2.default.func,horizontalGridStep:_propTypes2.default.number};XAxis.defaultProps={align:'center'};exports.default=XAxis;
\ No newline at end of file
diff --git a/dist/yAxis.js b/dist/yAxis.js
index 4d8ea0b..20a66b9 100644
--- a/dist/yAxis.js
+++ b/dist/yAxis.js
@@ -1,4 +1,6 @@
 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 _propTypes=require('prop-types');var _propTypes2=_interopRequireDefault(_propTypes);
+
 var _react=require('react');var _react2=_interopRequireDefault(_react);
 var _reactNative=require('react-native');
 var _util=require('./util');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;}
@@ -108,4 +110,4 @@ this.props.placement==='right'&&{borderLeftColor:this.props.axisColor,borderLeft
 range.map(this._createLabelForYAxis)));
 
 
-}}]);return YAxis;}(_react.Component);YAxis.propTypes={axisColor:_react.PropTypes.any,axisLineWidth:_react.PropTypes.number,data:_react.PropTypes.arrayOf(_react.PropTypes.arrayOf(_react.PropTypes.array)).isRequired,height:_react.PropTypes.number.isRequired,placement:_react.PropTypes.oneOf(['left','right']),verticalGridStep:_react.PropTypes.number.isRequired,yAxisTransform:_react.PropTypes.func,yAxisUseDecimal:_react.PropTypes.bool,yAxisShortLabel:_react.PropTypes.bool};YAxis.defaultProps={placement:'left'};exports.default=YAxis;
\ No newline at end of file
+}}]);return YAxis;}(_react.Component);YAxis.propTypes={axisColor:_propTypes2.default.any,axisLineWidth:_propTypes2.default.number,data:_propTypes2.default.arrayOf(_propTypes2.default.arrayOf(_propTypes2.default.array)).isRequired,height:_propTypes2.default.number.isRequired,placement:_propTypes2.default.oneOf(['left','right']),verticalGridStep:_propTypes2.default.number.isRequired,yAxisTransform:_propTypes2.default.func,yAxisUseDecimal:_propTypes2.default.bool,yAxisShortLabel:_propTypes2.default.bool};YAxis.defaultProps={placement:'left'};exports.default=YAxis;
\ No newline at end of file
diff --git a/package.json b/package.json
index f9d8cda..831fb24 100644
--- a/package.json
+++ b/package.json
@@ -86,5 +86,5 @@
     "lint": "eslint src",
     "prepublish": "npm run build"
   },
-  "version": "1.0.8-beta"
+  "version": "1.0.9-beta"
 }
diff --git a/src/Chart.js b/src/Chart.js
index 7c9e8a1..1df5b35 100644
--- a/src/Chart.js
+++ b/src/Chart.js
@@ -1,6 +1,8 @@
 /* @flow */
 'use strict';
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React, { Component } from 'react';
 import { LayoutAnimation, StyleSheet, View } from 'react-native';
 import BarChart from './BarChart';
 import LineChart from './LineChart';
diff --git a/src/Circle.js b/src/Circle.js
index b7fc32d..9faa089 100644
--- a/src/Circle.js
+++ b/src/Circle.js
@@ -1,5 +1,7 @@
 /* @flow */
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React, { Component } from 'react';
 import { ART } from 'react-native';
 const { Path, Shape } = ART;
 import * as C from './constants';
diff --git a/src/Grid.js b/src/Grid.js
index 7fc73ee..e6c98f6 100644
--- a/src/Grid.js
+++ b/src/Grid.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { View, StyleSheet } from 'react-native';
 import { uniqueValuesInDataSets } from './util';
 
diff --git a/src/Wedge.js b/src/Wedge.js
index 018adcd..16abf14 100644
--- a/src/Wedge.js
+++ b/src/Wedge.js
@@ -23,7 +23,9 @@
  *
  */
 
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React, { Component } from 'react';
 import { ART } from 'react-native';
 const { Shape, Path } = ART;
 
diff --git a/src/xAxis.js b/src/xAxis.js
index 389e094..935e93f 100644
--- a/src/xAxis.js
+++ b/src/xAxis.js
@@ -1,6 +1,8 @@
 /* @flow */
 'use strict';
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React, { Component } from 'react';
 import { View, Text, StyleSheet } from 'react-native';
 import { uniqueValuesInDataSets } from './util';
 
diff --git a/src/yAxis.js b/src/yAxis.js
index 64ad81c..5d79d67 100644
--- a/src/yAxis.js
+++ b/src/yAxis.js
@@ -1,5 +1,7 @@
 /* @flow */
-import React, { Component, PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React, { Component } from 'react';
 import { View, Text, StyleSheet } from 'react-native';
 import { uniqueValuesInDataSets } from './util';