diff --git a/docs/esp32_pinmap.png b/docs/esp32_pinmap.png
index d8f96efff5b..2c46148f330 100644
Binary files a/docs/esp32_pinmap.png and b/docs/esp32_pinmap.png differ
diff --git a/libraries/ArduinoOTA/src/ArduinoOTA.cpp b/libraries/ArduinoOTA/src/ArduinoOTA.cpp
index 2d99808bff5..1e100991fdc 100644
--- a/libraries/ArduinoOTA/src/ArduinoOTA.cpp
+++ b/libraries/ArduinoOTA/src/ArduinoOTA.cpp
@@ -149,13 +149,13 @@ int ArduinoOTAClass::parseInt(){
 
 String ArduinoOTAClass::readStringUntil(char end){
     String res = "";
-    char value;
+    int value;
     while(true){
         value = _udp_ota.read();
-        if(value == '\0' || value == end){
+        if(value <= 0 || value == end){
             return res;
         }
-        res += value;
+        res += (char)value;
     }
     return res;
 }