diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index c923d871..51114e7d 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -839,6 +839,12 @@
     "servosMax": {
         "message": "MAX"
     },
+    "servosAngleAtMin": {
+        "message": "Angle at min"
+    },
+    "servosAngleAtMax": {
+        "message": "Angle at max"
+    },
     "servosDirectionAndRate": {
         "message": "Direction and rate"
     },
diff --git a/js/msp.js b/js/msp.js
index df836a88..e6418b08 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -466,8 +466,8 @@ var MSP = {
                                 'max':                      data.getInt16(i + 2, 1),
                                 'middle':                   data.getInt16(i + 4, 1),
                                 'rate':                     data.getInt8(i + 6),
-                                'angleAtMin':               data.getUint8(i + 7),
-                                'angleAtMax':               data.getUint8(i + 8),
+                                'angleAtMin':               data.getInt8(i + 7),
+                                'angleAtMax':               data.getInt8(i + 8),
                                 'indexOfChannelToForward':  data.getInt8(i + 9),
                                 'reversedInputSources':     data.getUint32(i + 10)
                             };
diff --git a/tabs/servos.html b/tabs/servos.html
index 00e9218f..8fa54adc 100644
--- a/tabs/servos.html
+++ b/tabs/servos.html
@@ -7,6 +7,8 @@
                 <th style="width: 120px" i18n="servosMid"></th>
                 <th style="width: 120px" i18n="servosMin"></th>
                 <th style="width: 120px" i18n="servosMax"></th>
+                <th style="width: 120px" i18n="servosAngleAtMin"></th>
+                <th style="width: 120px" i18n="servosAngleAtMax"></th>
                 <th style="width: 40px">CH1</th>
                 <th style="width: 40px">CH2</th>
                 <th style="width: 40px">CH3</th>
diff --git a/tabs/servos.js b/tabs/servos.js
index 2ed1f188..b088d8c0 100644
--- a/tabs/servos.js
+++ b/tabs/servos.js
@@ -78,6 +78,8 @@ TABS.servos.initialize = function (callback) {
                     <td class="middle"><input type="number" min="1000" max="2000" value="' + SERVO_CONFIG[obj].middle + '" /></td>\
                     <td class="min"><input type="number" min="1000" max="2000" value="' + SERVO_CONFIG[obj].min +'" /></td>\
                     <td class="max"><input type="number" min="1000" max="2000" value="' + SERVO_CONFIG[obj].max +'" /></td>\
+                    <td class="angleAtMin"><input type="number" min="-90" max="0" value="' + SERVO_CONFIG[obj].angleAtMin +'" /></td>\
+                    <td class="angleAtMax"><input type="number" min="0" max="90" value="' + SERVO_CONFIG[obj].angleAtMax +'" /></td>\
                     ' + servoCheckbox + '\
                     <td class="direction">\
                     </td>\
@@ -131,6 +133,8 @@ TABS.servos.initialize = function (callback) {
                 SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val());
                 SERVO_CONFIG[info.obj].min = parseInt($('.min input', this).val());
                 SERVO_CONFIG[info.obj].max = parseInt($('.max input', this).val());
+                SERVO_CONFIG[info.obj].angleAtMin = parseInt($('.angleAtMin input', this).val());
+                SERVO_CONFIG[info.obj].angleAtMax = parseInt($('.angleAtMax input', this).val());
 
                 var val = parseInt($('.direction select', this).val());
                 SERVO_CONFIG[info.obj].rate = val;