diff --git a/compLib/Battery.py b/compLib/Battery.py
index fd95f1d..9cb76e9 100644
--- a/compLib/Battery.py
+++ b/compLib/Battery.py
@@ -4,7 +4,7 @@ BATTERY_CHANNEL = 2
 BATTERY_COUNT = 2
 BATTERY_MULTIPLIER = 3
 BATTERY_MIN_VOLTAGE = 3.6
-BATTERY_MAX_VOLTAGE = 4.1
+BATTERY_MAX_VOLTAGE = 4.2
 
 adc = ADC()
 
@@ -21,4 +21,4 @@ class Battery(object):
         :rtype: int
         """
         voltage = adc.read(BATTERY_CHANNEL) * BATTERY_MULTIPLIER
-        return int((voltage - BATTERY_MIN_VOLTAGE) / BATTERY_MAX_VOLTAGE * 100)
+        return int(((voltage /  BATTERY_COUNT) - BATTERY_MIN_VOLTAGE) / (BATTERY_MAX_VOLTAGE - BATTERY_MIN_VOLTAGE)  * 100)