diff --git a/README.md b/README.md
index d9d7f58..125ad0f 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,18 @@ The configuration portal is of the captive variety, so on various devices it wil
 
 First attempt at a library. Lots more changes and fixes to do. Contributions are welcome.
 
-### ESP32 must be patched with webserver library!!!!!! see https://github.com/tzapu/WiFiManager/issues/241
+**This works with the ESP8266 Arduino platform with a recent stable release(2.0.0 or newer)**
 
-#### This works with the ESP8266 Arduino platform with a recent stable release(2.0.0 or newer) https://github.com/esp8266/Arduino
+[https://github.com/esp8266/Arduino](https://github.com/esp8266/Arduino)
+
+**This works with the ESP32 Arduino platform with staging , with caveats below** 
+
+[https://github.com/espressif/arduino-esp32](https://github.com/espressif/arduino-esp32)
+
+### Known Issues
+* ESP32 must be patched with webserver library ! see [https://github.com/tzapu/WiFiManager/issues/513](https://github.com/tzapu/WiFiManager/issues/513)
+* ESP32 espressif/dnsserver contains bugs that prevent captibe portal from working ! see [https://github.com/tzapu/WiFiManager/issues/513](https://github.com/tzapu/WiFiManager/issues/513)
+* Documentation needs to be updated, see [https://github.com/tzapu/WiFiManager/issues/500](https://github.com/tzapu/WiFiManager/issues/500)
 
 ## Contents
  - [How it works](#how-it-works)
diff --git a/WiFiManager.h b/WiFiManager.h
index 2f71e7f..ed6f428 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -33,13 +33,16 @@
     
     #define WIFI_getChipId() (uint32_t)ESP.getEfuseMac()
     #define WIFI_AUTH_OPEN   WIFI_AUTH_OPEN
-    
-    #ifdef WEBSERVERSHIM
-        #include <WebServer.h>
-    #else
-        #include <ESP8266WebServer.h>
-        // Forthcoming official
-        // https://github.com/esp8266/ESPWebServer
+
+    #ifndef WEBSERVER_H
+        #warning "WEBSERVER not implemented in espressif/esp32, see readme notes"
+        #ifdef WEBSERVERSHIM
+            #include <WebServer.h>
+        #else
+            #include <ESP8266WebServer.h>
+            // Forthcoming official
+            // https://github.com/esp8266/ESPWebServer
+        #endif
     #endif
 
 #else