diff --git a/css/style.css b/css/style.css
index ceca3eff..7442d891 100644
--- a/css/style.css
+++ b/css/style.css
@@ -342,6 +342,33 @@ a:hover {
             padding: 5px;
             line-height: 18px;
         }
+    .tab-initial_setup .battery {
+        float: left;
+        display: block;
+        
+        margin-top: 10px;
+        margin-left: 20px;
+        
+        width: 145px;
+        
+        border: 1px solid silver;  
+    }
+        .tab-initial_setup .battery .head {
+            display: block;
+            
+            text-align: center;
+            line-height: 20px;
+            font-weight: bold;
+            
+            border-bottom: 1px solid silver;
+            background-color: #ececec;
+        }
+        .tab-initial_setup .battery .fields {
+            padding: 5px;
+        }
+        .tab-initial_setup .battery .bat-voltage {
+            padding-left: 20px;
+        }
     .tab-initial_setup .compass-wrapper {
         float: left;
         
diff --git a/js/main.js b/js/main.js
index c37e5157..a82344a4 100644
--- a/js/main.js
+++ b/js/main.js
@@ -50,7 +50,7 @@ $(document).ready(function() {
     });
     
     // temporary
-    //$('#content').load("./tabs/about.html");
+    //$('#content').load("./tabs/initial_setup.html", tab_initialize_initial_setup);
 });
 
 function disable_timers() {
diff --git a/js/serial_backend.js b/js/serial_backend.js
index d0396220..154898e8 100644
--- a/js/serial_backend.js
+++ b/js/serial_backend.js
@@ -39,7 +39,7 @@ var MSP_codes = {
     
     MSP_DEBUGMSG:           253,
     MSP_DEBUG:              254
-};
+}
 
 var CONFIG = {
     version:       0,
@@ -48,7 +48,7 @@ var CONFIG = {
     i2cError:      0,
     activeSensors: 0,
     mode:          0
-};
+}
 
 var PIDs = new Array(10);
 for (var i = 0; i < 10; i++) {
@@ -64,7 +64,7 @@ var RC = {
     AUX2:     0,
     AUX3:     0,
     AUX4:     0
-};
+}
 
 var RC_tuning = {
     RC_RATE:         0,
@@ -74,7 +74,7 @@ var RC_tuning = {
     dynamic_THR_PID: 0,
     throttle_MID:    0,
     throttle_EXPO:   0,
-};
+}
 
 var AUX_CONFIG = new Array();
 var AUX_CONFIG_values = new Array();
@@ -87,7 +87,7 @@ var SENSOR_DATA = {
     kinematicsX:   0.0,
     kinematicsY:   0.0,
     kinematicsZ:   0.0
-};
+}
 
 var MOTOR_DATA = new Array(8);
 var SERVO_DATA = new Array(8);
@@ -102,7 +102,12 @@ var GPS_DATA = {
     distanceToHome:  0,
     ditectionToHome: 0,
     update:          0
-};
+}
+
+var BATTERY = {
+    voltage:   0,
+    pMeterSum: 0,
+}
 
 var CLI_active = false;
 
@@ -489,7 +494,8 @@ function process_message(code, data) {
             SENSOR_DATA.altitude = view.getUint32(0, 1) / 100.0; // correct scale factor
             break; 
         case MSP_codes.MSP_BAT:
-            console.log(data);
+            BATTERY.voltage = view.getUint8(0) / 10.0;
+            BATTERY.power = view.getUint16(1, 1);
             break; 
         case MSP_codes.MSP_RC_TUNING:
             RC_tuning.RC_RATE = parseFloat((view.getUint8(0) / 100).toFixed(2));
diff --git a/tabs/initial_setup.html b/tabs/initial_setup.html
index 07361456..45e7937b 100644
--- a/tabs/initial_setup.html
+++ b/tabs/initial_setup.html
@@ -64,6 +64,12 @@
             </tr>            
         </table>
     </div>
+    <div class="battery">
+        <span class="head">Battery</span>
+        <div class="fields">
+            Voltage: <span class="bat-voltage">0 V</span>
+        </div>
+    </div>
     <div class="compass-wrapper">
         <div id="compass">
             <span>N</span>
diff --git a/tabs/initial_setup.js b/tabs/initial_setup.js
index 7c96a24a..a29d0954 100644
--- a/tabs/initial_setup.js
+++ b/tabs/initial_setup.js
@@ -44,8 +44,12 @@ function data_poll() {
     $('div#compass .pointer').css('-webkit-transform', 'rotate(' + (SENSOR_DATA.kinematicsZ) + 'deg)'); 
     $('div#compass .value').html(SENSOR_DATA.kinematicsZ + '&deg;');
     
+    // Update voltage indicator
+    $('span.bat-voltage').html(BATTERY.voltage + ' V');
+    
     // Request new data
     send_message(MSP_codes.MSP_ATTITUDE, MSP_codes.MSP_ATTITUDE); 
     send_message(MSP_codes.MSP_RAW_GPS, MSP_codes.MSP_RAW_GPS);
     send_message(MSP_codes.MSP_COMP_GPS, MSP_codes.MSP_COMP_GPS);
+    send_message(MSP_codes.MSP_BAT, MSP_codes.MSP_BAT);
 }
\ No newline at end of file