diff --git a/DefaultViewPageIndicator.js b/DefaultViewPageIndicator.js
index 320d4a2..fcc7356 100644
--- a/DefaultViewPageIndicator.js
+++ b/DefaultViewPageIndicator.js
@@ -2,6 +2,8 @@
 
 var React = require('react');
 var ReactNative = require('react-native');
+var PropTypes = require('prop-types');
+
 var {
   Dimensions,
   StyleSheet,
@@ -46,11 +48,11 @@ var styles = StyleSheet.create({
   },
 });
 
-var DefaultViewPageIndicator = React.createClass({
+export default class DefaultViewPageIndicator extends React.component{
   propTypes: {
-    goToPage: React.PropTypes.func,
-    activePage: React.PropTypes.number,
-    pageCount: React.PropTypes.number
+    goToPage: PropTypes.func,
+    activePage: PropTypes.number,
+    pageCount: PropTypes.number
   },
 
   getInitialState() {
@@ -100,6 +102,4 @@ var DefaultViewPageIndicator = React.createClass({
       </View>
     );
   },
-});
-
-module.exports = DefaultViewPageIndicator;
+};
diff --git a/ViewPager.js b/ViewPager.js
index dba9b45..8328e4f 100644
--- a/ViewPager.js
+++ b/ViewPager.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var React = require('react');
-var { PropTypes } = React;
+var PropTypes  = require('prop-types');
 
 var ReactNative = require('react-native');
 var {
@@ -21,7 +21,7 @@ var DefaultViewPageIndicator = require('./DefaultViewPageIndicator');
 var deviceWidth = Dimensions.get('window').width;
 var ViewPagerDataSource = require('./ViewPagerDataSource');
 
-var ViewPager = React.createClass({
+export default class ViewPager extend React.Component{
   mixins: [TimerMixin],
 
   statics: {
@@ -153,7 +153,7 @@ var ViewPager = React.createClass({
         this.state.scrollValue.setValue(constrainedPage > 0 ? 1 : 0);
       }
 
-      this.childIndex = Math.min(this.childIndex, constrainedPage);
+//       this.childIndex = Math.min(this.childIndex, constrainedPage);
       this.fling = false;
     }
 
@@ -329,7 +329,7 @@ var ViewPager = React.createClass({
       </View>
     );
   }
-});
+};
 
 var styles = StyleSheet.create({
   indicators: {
@@ -342,5 +342,3 @@ var styles = StyleSheet.create({
     backgroundColor: 'transparent',
   },
 });
-
-module.exports = ViewPager;