diff --git a/README.md b/README.md
index 738de8a..e7da0b9 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@ SegmentedControl.propTypes = {
     , onValueChange: React.PropTypes.func
     , androidTint: React.PropTypes.string   //Android Specific, overrides tintColor
     , height: React.PropTypes.number        //Android Specific
+    , androidTextActive: React.PropTypes.string //Android Specific
+    , androidTextColor: React.PropTypes.string //Android Specific
 };
 
 SegmentedControl.defaultProps = {
@@ -105,4 +107,4 @@ const styles = StyleSheet.create({
         , marginBottom: 5
     }
 });
-```
\ No newline at end of file
+```
diff --git a/android/segmentedControl.js b/android/segmentedControl.js
index 40f9da5..cb1c84d 100644
--- a/android/segmentedControl.js
+++ b/android/segmentedControl.js
@@ -6,6 +6,7 @@ import {
     , TouchableWithoutFeedback
     , Dimensions
 } from 'react-native';
+import PropTypes from 'prop-types';
 
 class SegmentedControl extends Component {
 
@@ -60,8 +61,8 @@ class SegmentedControl extends Component {
                             <Text
                                 style={[styles.textValue, {
                                 color: p.selectedIndex == i
-                                    ? 'black'
-                                    : 'grey'
+                                    ? this.props.androidTextActive
+                                    : this.props.androidTextColor
                                 }]}>{v}</Text>
                         </View>
                     </TouchableWithoutFeedback>)}
@@ -70,20 +71,24 @@ class SegmentedControl extends Component {
     }
 }
 
-SegmentedControl.propTypes = {
-    values: React.PropTypes.arrayOf(React.PropTypes.string).isRequired
-    , tintColor: React.PropTypes.string
-    , enabled: React.PropTypes.bool
-    , onChange: React.PropTypes.func
-    , onValueChange: React.PropTypes.func
-    , androidTint: React.PropTypes.string   //Android Specific
-    , height: React.PropTypes.number        //Android Specific
+SegmentedControl.PropTypes = {
+    values: PropTypes.arrayOf(PropTypes.string).isRequired
+    , tintColor: PropTypes.string
+    , enabled: PropTypes.bool
+    , onChange: PropTypes.func
+    , onValueChange: PropTypes.func
+    , androidTint: PropTypes.string   //Android Specific
+    , height: PropTypes.number        //Android Specific
+    , androidTextActive: PropTypes.string //Android Specific
+    , androidTextColor: PropTypes.string //Android Specific
 };
 
 SegmentedControl.defaultProps = {
     height: 38
     , enabled: true
     , tintColor: 'black'
+    , androidTextActive: 'black'
+    , androidTextColor: 'grey'
 };
 
 const styles = StyleSheet.create({
@@ -108,4 +113,4 @@ const styles = StyleSheet.create({
     }
 });
 
-export default SegmentedControl;
\ No newline at end of file
+export default SegmentedControl;
diff --git a/package.json b/package.json
index 6209260..a4739fc 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/natdm/segmentedControl.git"
+    "url": "git+https://github.com/ClearScholar/segmentedControl.git"
   },
   "author": "",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/natdm/segmentedControl/issues"
+    "url": "https://github.com/ClearScholar/segmentedControl/issues"
   },
-  "homepage": "https://github.com/natdm/segmentedControl#readme"
+  "homepage": "https://github.com/ClearScholar/segmentedControl#readme",
+  "devDependencies": {
+    "prop-types": "^15.6.2"
+  }
 }