diff --git a/README.md b/README.md
index 4ee44ec..fab0a21 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,11 @@ Thanks to [cancodr](https://github.com/cancodr) for requesting an enhancement in
 ---
 ---
 
+### Releases v1.1.2
+
+1. Fix bug in examples.
+2. Add example.
+
 ### Releases v1.1.1
 
 1. Add setCORSHeader function to allow **configurable CORS Header**. See [Using CORS feature](https://github.com/khoih-prog/ESP_WiFiManager#15-using-cors-cross-origin-resource-sharing-feature)
@@ -108,6 +113,7 @@ to add support to `ESP32` besides `ESP8266`.
 This is an `ESP32 / ESP8266` WiFi Connection manager with fallback web ConfigPortal.
 It's using a web ConfigPortal, served from the `ESP32 / ESP8266`, and operating as an access point.
 
+---
 ---
 
 ## Prerequisite
@@ -115,9 +121,7 @@ It's using a web ConfigPortal, served from the `ESP32 / ESP8266`, and operating
  1. [`Arduino IDE 1.8.12+` for Arduino](https://www.arduino.cc/en/Main/Software)
  2. [`ESP8266 Core 2.7.3+`](https://github.com/esp8266/Arduino) for ESP8266-based boards.
  3. [`ESP32 Core 1.0.4+`](https://github.com/espressif/arduino-esp32) for ESP32-based boards
- 4. [`ESP_DoubleResetDetector v1.0.3+`](https://github.com/khoih-prog/ESP_DoubleResetDetector) if using DRD feature.
- 
- To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_DoubleResetDetector.svg?)](https://www.ardu-badge.com/ESP_DoubleResetDetector).
+ 4. [`ESP_DoubleResetDetector v1.0.3+`](https://github.com/khoih-prog/ESP_DoubleResetDetector) if using DRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_DoubleResetDetector.svg?)](https://www.ardu-badge.com/ESP_DoubleResetDetector).
 
 ---
 
@@ -139,6 +143,7 @@ The best and easiest way is to use `Arduino Library Manager`. Search for `ESP_Wi
 3. Install **ESP_WiFiManager** library by using [Library Manager](https://docs.platformio.org/en/latest/librarymanager/). Search for ***ESP_WiFiManager*** in [Platform.io Author's Libraries](https://platformio.org/lib/search?query=author:%22Khoi%20Hoang%22)
 4. Use included [platformio.ini](platformio/platformio.ini) file from examples to ensure that all dependent libraries will installed automatically. Please visit documentation for the other options and examples at [Project Configuration File](https://docs.platformio.org/page/projectconf.html)
 
+---
 ---
 
 ## How It Works
@@ -165,6 +170,7 @@ then connect WebBrowser to configurable ConfigPortal IP address, default is 192.
 #### 1. Using default for every configurable parameter
 
 - Include in your sketch
+
 ```cpp
 #ifdef ESP32
   #include <esp_wifi.h>
@@ -686,6 +692,8 @@ ESP_wifiManager.setSTAStaticIPConfig(stationIP, gatewayIP, netMask, dns1IP, dns2
 #define USING_CORS_FEATURE     false
 ```
 
+---
+
 #### 16. Using MultiWiFi auto(Re)connect feature
 
 1. In loop()
@@ -770,6 +778,7 @@ ESP_wifiManager.setConfigPortalChannel(0);
 
 Once WiFi network information is saved in the `ESP32 / ESP8266`, it will try to autoconnect to WiFi every time it is started, without requiring any function calls in the sketch.
 
+---
 ---
 
 ### Examples
@@ -788,11 +797,13 @@ Once WiFi network information is saved in the `ESP32 / ESP8266`, it will try to
 12. [AutoConnectWithFeedbackLED](examples/AutoConnectWithFeedbackLED)
 13. [AutoConnectWithFSParameters](examples/AutoConnectWithFSParameters)
 14. [ConfigOnSwitchFS_MQTT_Ptr](examples/ConfigOnSwitchFS_MQTT_Ptr)
+15. [ConfigOnDRD_FS_MQTT_Ptr](examples/ConfigOnDRD_FS_MQTT_Ptr). **NEW**
 
 ---
 ---
 
 ## So, how it works?
+
 In `ConfigPortal Mode`, it starts an access point called `ESP_XXXXXX`. Connect to it using the `configurable password` you can define in the code. For example, `your_password` (see examples):
 
 ```cpp
@@ -838,6 +849,7 @@ If you're already connected to a listed WiFi AP and don't want to change anythin
 ## Documentation
 
 #### Password protect the configuration Access Point
+
 You can password protect the ConfigPortal AP.  Simply add an SSID as the first parameter and the password as a second parameter to `startConfigPortal`. See the above examples.
 A short password seems to have unpredictable results so use one that's around 8 characters or more in length.
 The guidelines are that a wifi password must consist of 8 to 63 ASCII-encoded characters in the range of 32 to 126 (decimal)
@@ -849,6 +861,7 @@ ESP_wifiManager.startConfigPortal( SSID , password )
 #### Callbacks
 
 ##### Save settings
+
 This gets called when custom parameters have been set **AND** a connection has been established. Use it to set a flag, so when all the configuration finishes, you can save the extra parameters somewhere.
 
 See [ConfigOnSwitchFS Example](examples/ConfigOnSwitchFS).
@@ -868,7 +881,9 @@ void saveConfigCallback () {
 ```
 
 #### ConfigPortal Timeout
+
 If you need to set a timeout so the `ESP32 / ESP8266` doesn't hang waiting to be configured for ever. 
+
 ```cpp
 ESP_wifiManager.setConfigPortalTimeout(120);
 ```
@@ -1001,9 +1016,11 @@ Many applications need configuration parameters like `MQTT host and port`, [Blyn
 To capture other parameters with `ESP_WiFiManager` is a lot more involved than all the other features and requires adding custom HTML to your form. If you want to do it with `ESP_WiFiManager` see the example [ConfigOnSwitchFS](examples/ConfigOnSwitchFS)
 
 #### Custom IP Configuration
+
 You can set a custom IP for both AP (access point, config mode) and STA (station mode, client mode, normal project state)
 
 ##### Custom Access Point IP Configuration
+
 This will set your captive portal to a specific IP should you need/want such a feature. Add the following snippet before `startConfigPortal()`
 ```cpp
 //set custom ip for portal
@@ -1011,13 +1028,16 @@ ESP_wifiManager.setAPStaticIPConfig(IPAddress(10,0,1,1), IPAddress(10,0,1,1), IP
 ```
 
 ##### Custom Station (client) Static IP Configuration
+
 This will use the specified IP configuration instead of using DHCP in station mode.
 ```cpp
 ESP_wifiManager.setSTAStaticIPConfig(IPAddress(192,168,0,99), IPAddress(192,168,0,1), IPAddress(255,255,255,0));
 ```
 
 #### Custom HTML, CSS, Javascript
+
 There are various ways in which you can inject custom HTML, CSS or Javascript into the ConfigPortal.
+
 The options are:
 - inject custom head element
 You can use this to any html bit to the head of the ConfigPortal. If you add a `<style>` element, bare in mind it overwrites the included css, not replaces.
@@ -1041,6 +1061,7 @@ ESP_WMParameter custom_mqtt_server("server", "mqtt server", "iot.eclipse", 40, "
 ```
 
 #### Filter Networks
+
 You can filter networks based on signal quality and show/hide duplicate networks.
 
 - If you would like to filter low signal quality networks you can tell WiFiManager to not show networks below an arbitrary quality %;
@@ -1057,10 +1078,24 @@ Use this function to show (or hide) all networks.
 ESP_wifiManager.setRemoveDuplicateAPs(false);
 ```
 ---
+---
 
-### Example [ConfigOnSwitchFS_MQTT_Ptr](examples/ConfigOnSwitchFS_MQTT_Ptr)
+### Example [ConfigOnDRD_FS_MQTT_Ptr](examples/ConfigOnDRD_FS_MQTT_Ptr)
 
 ```cpp
+/****************************************************************************************************************************
+  This example will open a Config Portal when there is no stored WiFi Credentials or when a DRD is detected.
+  
+  You can reconfigure to use another pin, such as the convenience FLASH / BOOT button @ PIN_D0;.
+   
+  A password is required to connect to the Config Portal so that only who know the password can access the Config Portal.
+  
+  The Credentials, being input via Config Portal, will then be saved into LittleFS / SPIFFS file, and be used to connect to 
+  Adafruit MQTT Server at "io.adafruit.com" and publish a Temperature Topic
+  
+  Based on original sketch posted by "Marko"(https://github.com/wackoo-arduino) on https://forum.arduino.cc/index.php?topic=692108
+ *****************************************************************************************************************************/
+
 #if !( defined(ESP8266) ||  defined(ESP32) )
   #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
 #endif
@@ -1139,120 +1174,66 @@ ESP_wifiManager.setRemoveDuplicateAPs(false);
   #define LED_OFF     HIGH
 #endif
 
-#include "Adafruit_MQTT.h"                //https://github.com/adafruit/Adafruit_MQTT_Library
-#include "Adafruit_MQTT_Client.h"         //https://github.com/adafruit/Adafruit_MQTT_Library
-
-#if ESP32
+// These defines must be put before #include <ESP_DoubleResetDetector.h>
+// to select where to store DoubleResetDetector's variable.
+// For ESP32, You must select one to be true (EEPROM or SPIFFS)
+// For ESP8266, You must select one to be true (RTC, EEPROM, SPIFFS or LITTLEFS)
+// Otherwise, library will use default EEPROM storage
+#ifdef ESP32
 
-  //See file .../hardware/espressif/esp32/variants/(esp32|doitESP32devkitV1)/pins_arduino.h
-  #define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
-  #define PIN_LED           2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
-  
-  #define PIN_D0            0         // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32
-  #define PIN_D1            1         // Pin D1 mapped to pin GPIO1/TX0 of ESP32
-  #define PIN_D2            2         // Pin D2 mapped to pin GPIO2/ADC12/TOUCH2 of ESP32
-  #define PIN_D3            3         // Pin D3 mapped to pin GPIO3/RX0 of ESP32
-  #define PIN_D4            4         // Pin D4 mapped to pin GPIO4/ADC10/TOUCH0 of ESP32
-  #define PIN_D5            5         // Pin D5 mapped to pin GPIO5/SPISS/VSPI_SS of ESP32
-  #define PIN_D6            6         // Pin D6 mapped to pin GPIO6/FLASH_SCK of ESP32
-  #define PIN_D7            7         // Pin D7 mapped to pin GPIO7/FLASH_D0 of ESP32
-  #define PIN_D8            8         // Pin D8 mapped to pin GPIO8/FLASH_D1 of ESP32
-  #define PIN_D9            9         // Pin D9 mapped to pin GPIO9/FLASH_D2 of ESP32
-  
-  #define PIN_D10           10        // Pin D10 mapped to pin GPIO10/FLASH_D3 of ESP32
-  #define PIN_D11           11        // Pin D11 mapped to pin GPIO11/FLASH_CMD of ESP32
-  #define PIN_D12           12        // Pin D12 mapped to pin GPIO12/HSPI_MISO/ADC15/TOUCH5/TDI of ESP32
-  #define PIN_D13           13        // Pin D13 mapped to pin GPIO13/HSPI_MOSI/ADC14/TOUCH4/TCK of ESP32
-  #define PIN_D14           14        // Pin D14 mapped to pin GPIO14/HSPI_SCK/ADC16/TOUCH6/TMS of ESP32
-  #define PIN_D15           15        // Pin D15 mapped to pin GPIO15/HSPI_SS/ADC13/TOUCH3/TDO of ESP32
-  #define PIN_D16           16        // Pin D16 mapped to pin GPIO16/TX2 of ESP32
-  #define PIN_D17           17        // Pin D17 mapped to pin GPIO17/RX2 of ESP32
-  #define PIN_D18           18        // Pin D18 mapped to pin GPIO18/VSPI_SCK of ESP32
-  #define PIN_D19           19        // Pin D19 mapped to pin GPIO19/VSPI_MISO of ESP32
-  
-  #define PIN_D21           21        // Pin D21 mapped to pin GPIO21/SDA of ESP32
-  #define PIN_D22           22        // Pin D22 mapped to pin GPIO22/SCL of ESP32
-  #define PIN_D23           23        // Pin D23 mapped to pin GPIO23/VSPI_MOSI of ESP32
-  #define PIN_D24           24        // Pin D24 mapped to pin GPIO24 of ESP32
-  #define PIN_D25           25        // Pin D25 mapped to pin GPIO25/ADC18/DAC1 of ESP32
-  #define PIN_D26           26        // Pin D26 mapped to pin GPIO26/ADC19/DAC2 of ESP32
-  #define PIN_D27           27        // Pin D27 mapped to pin GPIO27/ADC17/TOUCH7 of ESP32
-  
-  #define PIN_D32           32        // Pin D32 mapped to pin GPIO32/ADC4/TOUCH9 of ESP32
-  #define PIN_D33           33        // Pin D33 mapped to pin GPIO33/ADC5/TOUCH8 of ESP32
-  #define PIN_D34           34        // Pin D34 mapped to pin GPIO34/ADC6 of ESP32
-  
-  //Only GPIO pin < 34 can be used as output. Pins >= 34 can be only inputs
-  //See .../cores/esp32/esp32-hal-gpio.h/c
-  //#define digitalPinIsValid(pin)          ((pin) < 40 && esp32_gpioMux[(pin)].reg)
-  //#define digitalPinCanOutput(pin)        ((pin) < 34 && esp32_gpioMux[(pin)].reg)
-  //#define digitalPinToRtcPin(pin)         (((pin) < 40)?esp32_gpioMux[(pin)].rtc:-1)
-  //#define digitalPinToAnalogChannel(pin)  (((pin) < 40)?esp32_gpioMux[(pin)].adc:-1)
-  //#define digitalPinToTouchChannel(pin)   (((pin) < 40)?esp32_gpioMux[(pin)].touch:-1)
-  //#define digitalPinToDacChannel(pin)     (((pin) == 25)?0:((pin) == 26)?1:-1)
-  
-  #define PIN_D35           35        // Pin D35 mapped to pin GPIO35/ADC7 of ESP32
-  #define PIN_D36           36        // Pin D36 mapped to pin GPIO36/ADC0/SVP of ESP32
-  #define PIN_D39           39        // Pin D39 mapped to pin GPIO39/ADC3/SVN of ESP32
-  
-  #define PIN_RX0            3        // Pin RX0 mapped to pin GPIO3/RX0 of ESP32
-  #define PIN_TX0            1        // Pin TX0 mapped to pin GPIO1/TX0 of ESP32
+  // These defines must be put before #include <ESP_DoubleResetDetector.h>
+  // to select where to store DoubleResetDetector's variable.
+  // For ESP32, You must select one to be true (EEPROM or SPIFFS)
+  // Otherwise, library will use default EEPROM storage
+  #if USE_SPIFFS
+    #define ESP_DRD_USE_SPIFFS      true
+    #define ESP_DRD_USE_EEPROM      false
+  #else
+    #define ESP_DRD_USE_SPIFFS      false
+    #define ESP_DRD_USE_EEPROM      true
+  #endif
   
-  #define PIN_SCL           22        // Pin SCL mapped to pin GPIO22/SCL of ESP32
-  #define PIN_SDA           21        // Pin SDA mapped to pin GPIO21/SDA of ESP32
+#else //ESP8266
   
-#else
+  // For DRD
+  // These defines must be put before #include <ESP_DoubleResetDetector.h>
+  // to select where to store DoubleResetDetector's variable.
+  // For ESP8266, You must select one to be true (RTC, EEPROM, SPIFFS or LITTLEFS)
+  // Otherwise, library will use default EEPROM storage
+  #if USE_LITTLEFS
+    #define ESP_DRD_USE_LITTLEFS    true
+    #define ESP_DRD_USE_SPIFFS      false
+  #else
+    #define ESP_DRD_USE_LITTLEFS    false
+    #define ESP_DRD_USE_SPIFFS      true
+  #endif
+    
+  #define ESP_DRD_USE_EEPROM      false
+  #define ESP8266_DRD_USE_RTC     false
+#endif
+ 
+#define DOUBLERESETDETECTOR_DEBUG       true  //false
 
-  //PIN_D0 can't be used for PWM/I2C
-  #define PIN_D0            16        // Pin D0 mapped to pin GPIO16/USER/WAKE of ESP8266. This pin is also used for Onboard-Blue LED. PIN_D0 = 0 => LED ON
-  #define PIN_D1            5         // Pin D1 mapped to pin GPIO5 of ESP8266
-  #define PIN_D2            4         // Pin D2 mapped to pin GPIO4 of ESP8266
-  #define PIN_D3            0         // Pin D3 mapped to pin GPIO0/FLASH of ESP8266
-  #define PIN_D4            2         // Pin D4 mapped to pin GPIO2/TXD1 of ESP8266
-  #define PIN_LED           2         // Pin D4 mapped to pin GPIO2/TXD1 of ESP8266, NodeMCU and WeMoS, control on-board LED
-  #define PIN_D5            14        // Pin D5 mapped to pin GPIO14/HSCLK of ESP8266
-  #define PIN_D6            12        // Pin D6 mapped to pin GPIO12/HMISO of ESP8266
-  #define PIN_D7            13        // Pin D7 mapped to pin GPIO13/RXD2/HMOSI of ESP8266
-  #define PIN_D8            15        // Pin D8 mapped to pin GPIO15/TXD2/HCS of ESP8266
-  
-  //Don't use pins GPIO6 to GPIO11 as already connected to flash, etc. Use them can crash the program
-  //GPIO9(D11/SD2) and GPIO11 can be used only if flash in DIO mode ( not the default QIO mode)
-  #define PIN_D11           9         // Pin D11/SD2 mapped to pin GPIO9/SDD2 of ESP8266
-  #define PIN_D12           10        // Pin D12/SD3 mapped to pin GPIO10/SDD3 of ESP8266
-  #define PIN_SD2           9         // Pin SD2 mapped to pin GPIO9/SDD2 of ESP8266
-  #define PIN_SD3           10        // Pin SD3 mapped to pin GPIO10/SDD3 of ESP8266
-  
-  #define PIN_D9            3         // Pin D9 /RX mapped to pin GPIO3/RXD0 of ESP8266
-  #define PIN_D10           1         // Pin D10/TX mapped to pin GPIO1/TXD0 of ESP8266
-  #define PIN_RX            3         // Pin RX mapped to pin GPIO3/RXD0 of ESP8266
-  #define PIN_TX            1         // Pin RX mapped to pin GPIO1/TXD0 of ESP8266
-  
-  #define LED_PIN           16        // Pin D0 mapped to pin GPIO16 of ESP8266. This pin is also used for Onboard-Blue LED. PIN_D0 = 0 => LED ON
+#include <ESP_DoubleResetDetector.h>      //https://github.com/khoih-prog/ESP_DoubleResetDetector
 
-#endif    //ESP32
+// Number of seconds after reset during which a
+// subseqent reset will be considered a double reset.
+#define DRD_TIMEOUT 10
 
-#if ESP32
-  const int BUTTON_PIN  = PIN_D27;
-  const int RED_LED     = PIN_D26;
-  const int BLUE_LED    = PIN_D25;
-#else
-  const int BUTTON_PIN  = PIN_D1;
-  const int RED_LED     = PIN_D2;
-  const int BLUE_LED    = PIN_D5;
-#endif    //ESP32
+// RTC Memory Address for the DoubleResetDetector to use
+#define DRD_ADDRESS 0
 
-uint32_t timer = millis();
-int some_number = 5;
+DoubleResetDetector* drd = NULL;
 
-const char* CONFIG_FILE = "/ConfigMQTT.json";
+#include "Adafruit_MQTT.h"                //https://github.com/adafruit/Adafruit_MQTT_Library
+#include "Adafruit_MQTT_Client.h"         //https://github.com/adafruit/Adafruit_MQTT_Library
 
-// Indicates whether ESP has WiFi credentials saved from previous session
-bool initialConfig = true; //default false
+const char* CONFIG_FILE = "/ConfigMQTT.json";
 
 // Default configuration values for Adafruit IO MQTT
 // This actually works
 #define AIO_SERVER              "io.adafruit.com"
-#define AIO_SERVERPORT          1883 //1883, or 8883 for SSL
+#define AIO_SERVERPORT          "1883" //1883, or 8883 for SSL
 #define AIO_USERNAME            "private" //Adafruit IO
 #define AIO_KEY                 "private"
 
@@ -1268,16 +1249,17 @@ String MQTT_Pub_Topic   = "private/feeds/Temperature";
 // Variables to save custom parameters to...
 // I would like to use these instead of #defines
 #define custom_AIO_SERVER_LEN       20
+#define custom_AIO_PORT_LEN          5
 #define custom_AIO_USERNAME_LEN     20
 #define custom_AIO_KEY_LEN          40
 
 char custom_AIO_SERVER[custom_AIO_SERVER_LEN];
-int  custom_AIO_SERVERPORT;
+char custom_AIO_SERVERPORT[custom_AIO_PORT_LEN];
 char custom_AIO_USERNAME[custom_AIO_USERNAME_LEN];
 char custom_AIO_KEY[custom_AIO_KEY_LEN];
 
 // Function Prototypes
-
+void MQTT_connect();
 bool readConfigFile();
 bool writeConfigFile();
 
@@ -1290,7 +1272,7 @@ const char* password = "your_password";
 String Router_SSID;
 String Router_Pass;
 
-// From v1.1.0
+// From v1.1.1
 // You only need to format the filesystem once
 //#define FORMAT_FILESYSTEM       true
 #define FORMAT_FILESYSTEM         false
@@ -1325,12 +1307,12 @@ WM_Config         WM_config;
 #define  CONFIG_FILENAME              F("/wifi_cred.dat")
 //////
 
-// Indicates whether ESP has WiFi credentials saved from previous session
-//bool initialConfig = false;
+// Indicates whether ESP has WiFi credentials saved from previous session, or double reset detected
+bool initialConfig = false;
 
 // Use false if you don't like to display Available Pages in Information Page of Config Portal
 // Comment out or use true to display Available Pages in Information Page of Config Portal
-// Must be placed before #include <ESP_WiFiManager.h>
+// Must be placed before #include <ESPAsync_WiFiManager.h>
 #define USE_AVAILABLE_PAGES     false
 
 // From v1.0.10 to permit disable/enable StaticIP configuration in Config Portal from sketch. Valid only if DHCP is used.
@@ -1363,36 +1345,23 @@ WM_Config         WM_config;
 #define USE_DHCP_IP     false
 #endif
 
-// Use USE_DHCP_IP == true for dynamic DHCP IP, false to use static IP which you have to change accordingly to your network
-#if (defined(USE_STATIC_IP_CONFIG_IN_CP) && !USE_STATIC_IP_CONFIG_IN_CP)
-  // Force DHCP to be true
-  #if defined(USE_DHCP_IP)
-    #undef USE_DHCP_IP
-  #endif
-  #define USE_DHCP_IP     true
+#if ( USE_DHCP_IP || ( defined(USE_STATIC_IP_CONFIG_IN_CP) && !USE_STATIC_IP_CONFIG_IN_CP ) )
+// Use DHCP
+#warning Using DHCP IP
+IPAddress stationIP   = IPAddress(0, 0, 0, 0);
+IPAddress gatewayIP   = IPAddress(192, 168, 2, 1);
+IPAddress netMask     = IPAddress(255, 255, 255, 0);
 #else
-  // You can select DHCP or Static IP here
-  //#define USE_DHCP_IP     true
-  #define USE_DHCP_IP     false
+// Use static IP
+#warning Using static IP
+#ifdef ESP32
+IPAddress stationIP   = IPAddress(192, 168, 2, 232);
+#else
+IPAddress stationIP   = IPAddress(192, 168, 2, 186);
 #endif
 
-#if ( USE_DHCP_IP || ( defined(USE_STATIC_IP_CONFIG_IN_CP) && !USE_STATIC_IP_CONFIG_IN_CP ) )
-  // Use DHCP
-  #warning Using DHCP IP
-  IPAddress stationIP   = IPAddress(0, 0, 0, 0);
-  IPAddress gatewayIP   = IPAddress(192, 168, 2, 1);
-  IPAddress netMask     = IPAddress(255, 255, 255, 0);
-#else
-  // Use static IP
-  #warning Using static IP
-  #ifdef ESP32
-    IPAddress stationIP   = IPAddress(192, 168, 2, 232);
-  #else
-    IPAddress stationIP   = IPAddress(192, 168, 2, 186);
-  #endif
-  
-  IPAddress gatewayIP   = IPAddress(192, 168, 2, 1);
-  IPAddress netMask     = IPAddress(255, 255, 255, 0);
+IPAddress gatewayIP   = IPAddress(192, 168, 2, 1);
+IPAddress netMask     = IPAddress(255, 255, 255, 0);
 #endif
 
 #define USE_CONFIGURABLE_DNS      true
@@ -1402,13 +1371,7 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 
 #include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
 
-
-//Button config
-OneButton btn = OneButton(
-                  BUTTON_PIN,  // Input pin for the button
-                  true,        // Button is active LOW
-                  true         // Enable internal pull-up resistor
-                );
+#define HTTP_PORT           80
 
 // Create an ESP32 WiFiClient class to connect to the MQTT server
 WiFiClient *client                    = NULL;
@@ -1416,14 +1379,92 @@ WiFiClient *client                    = NULL;
 Adafruit_MQTT_Client    *mqtt         = NULL;
 Adafruit_MQTT_Publish   *Temperature  = NULL;
 
+// Forward Declaration
+
+uint8_t connectMultiWiFi(void)
+{
+#if ESP32
+  // For ESP32, this better be 0 to shorten the connect time
+  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       0
+#else
+  // For ESP8266, this better be 2200 to enable connect the 1st time
+  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       2200L
+#endif
+
+#define WIFI_MULTI_CONNECT_WAITING_MS           100L
+  
+  uint8_t status;
+
+  LOGERROR(F("ConnectMultiWiFi with :"));
+  
+  if ( (Router_SSID != "") && (Router_Pass != "") )
+  {
+    LOGERROR3(F("* Flash-stored Router_SSID = "), Router_SSID, F(", Router_Pass = "), Router_Pass );
+  }
+
+  for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
+  {
+    // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
+    if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
+    {
+      LOGERROR3(F("* Additional SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
+    }
+  }
+  
+  LOGERROR(F("Connecting MultiWifi..."));
+
+  WiFi.mode(WIFI_STA);
+
+#if !USE_DHCP_IP    
+  #if USE_CONFIGURABLE_DNS
+    // Set static IP, Gateway, Subnetmask, DNS1 and DNS2. New in v1.0.5
+    WiFi.config(stationIP, gatewayIP, netMask, dns1IP, dns2IP);
+  #else
+    // Set static IP, Gateway, Subnetmask, Use auto DNS1 and DNS2.
+    WiFi.config(stationIP, gatewayIP, netMask);
+  #endif 
+#endif
+
+  int i = 0;
+  status = wifiMulti.run();
+  delay(WIFI_MULTI_1ST_CONNECT_WAITING_MS);
+
+  while ( ( i++ < 20 ) && ( status != WL_CONNECTED ) )
+  {
+    status = wifiMulti.run();
+
+    if ( status == WL_CONNECTED )
+      break;
+    else
+      delay(WIFI_MULTI_CONNECT_WAITING_MS);
+  }
+
+  if ( status == WL_CONNECTED )
+  {
+    LOGERROR1(F("WiFi connected after time: "), i);
+    LOGERROR3(F("SSID:"), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
+    LOGERROR3(F("Channel:"), WiFi.channel(), F(",IP address:"), WiFi.localIP() );
+  }
+  else
+    LOGERROR(F("WiFi not connected"));
+
+  return status;
+}
+
+void toggleLED()
+{
+  //toggle state
+  digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
+}
+
 void heartBeatPrint(void)
 {
   static int num = 1;
 
   if (WiFi.status() == WL_CONNECTED)
-    Serial.print("W");        // W means connected to WiFi
+    Serial.print(F("W"));        // W means connected to WiFi
   else
-    Serial.print("N");        // N means not connected to WiFi
+    Serial.print(F("N"));        // N means not connected to WiFi
 
   if (num == 40)
   {
@@ -1432,23 +1473,27 @@ void heartBeatPrint(void)
   }
   else if (num++ % 5 == 0)
   {
-    Serial.print(" ");
+    Serial.print(F(" "));
   }
 }
 
 void publishMQTT(void)
 {
+    float some_number = 25.0 + (float) ( millis() % 100 ) /  100;
+
+    // For debug only
+    //Serial.print(F("Published Temp = "));
+    //Serial.println(some_number);
+    
     MQTT_connect();
 
     if (Temperature->publish(some_number)) 
     {
-      //Serial.println(F("Failed to send value to Temperature feed!"));
-      Serial.print("T");        // T means publishing OK
+      Serial.print(F("T"));        // T means publishing OK
     }
     else 
     {
-      //Serial.println(F("Value to Temperature feed sucessfully sent!"));
-      Serial.print("F");        // F means publishing failure
+      Serial.print(F("F"));        // F means publishing failure
     }
 }
 
@@ -1456,7 +1501,7 @@ void check_WiFi(void)
 {
   if ( (WiFi.status() != WL_CONNECTED) )
   {
-    Serial.println("\nWiFi lost. Call connectMultiWiFi in loop");
+    Serial.println(F("\nWiFi lost. Call connectMultiWiFi in loop"));
     connectMultiWiFi();
   }
 }
@@ -1464,12 +1509,14 @@ void check_WiFi(void)
 void check_status(void)
 {
   static ulong checkstatus_timeout  = 0;
+  static ulong LEDstatus_timeout    = 0;
   static ulong checkwifi_timeout    = 0;
   static ulong mqtt_publish_timeout = 0;
   
   ulong current_millis = millis();
 
 #define WIFICHECK_INTERVAL    1000L
+#define LED_INTERVAL          2000L
 #define HEARTBEAT_INTERVAL    10000L
 #define PUBLISH_INTERVAL      60000L
 
@@ -1480,6 +1527,13 @@ void check_status(void)
     checkwifi_timeout = current_millis + WIFICHECK_INTERVAL;
   }
 
+  if ((current_millis > LEDstatus_timeout) || (LEDstatus_timeout == 0))
+  {
+    // Toggle LED at LED_INTERVAL = 2s
+    toggleLED();
+    LEDstatus_timeout = current_millis + LED_INTERVAL;
+  }
+
   // Print hearbeat every HEARTBEAT_INTERVAL (10) seconds.
   if ((current_millis > checkstatus_timeout) || (checkstatus_timeout == 0))
   { 
@@ -1499,70 +1553,6 @@ void check_status(void)
   }
 }
 
-void deleteOldInstances(void)
-{
-  // Delete previous instances
-  if (mqtt)
-  {
-    delete mqtt;
-    mqtt = NULL;
-    Serial.println("Deleting old MQTT object");
-  }
-
-  if (Temperature)
-  {
-    delete Temperature;
-    Temperature = NULL;
-    Serial.println("Deleting old Temperature object");
-  }
-}
-
-void createNewInstances(void)
-{
-  if (!client)
-  {
-    client = new WiFiClient;
-
-    if (client)
-    {
-      Serial.println("\nCreating new WiFi client object OK");
-    }
-    else
-      Serial.println("\nCreating new WiFi client object failed");
-  }
-
-  // Create new instances from new data
-  if (!mqtt)
-  {
-    // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-    mqtt = new Adafruit_MQTT_Client(client, custom_AIO_SERVER, custom_AIO_SERVERPORT, custom_AIO_USERNAME, custom_AIO_KEY);
-
-    if (mqtt)
-    {
-      Serial.println("Creating new MQTT object OK");
-      Serial.println(String("AIO_SERVER = ")    + custom_AIO_SERVER    + ", AIO_SERVERPORT = "  + custom_AIO_SERVERPORT);
-      Serial.println(String("AIO_USERNAME = ")  + custom_AIO_USERNAME  + ", AIO_KEY = "         + custom_AIO_KEY);
-    }
-    else
-      Serial.println("Creating new MQTT object failed");
-  }
-
-  if (!Temperature)
-  {
-    Temperature = new Adafruit_MQTT_Publish(mqtt, MQTT_Pub_Topic.c_str());
-    Serial.println("Creating new MQTT_Pub_Topic,  Temperature = " + MQTT_Pub_Topic);
-
-     if (Temperature)
-     {
-      Serial.println("Creating new Temperature object OK");
-      Serial.println(String("Temperature MQTT_Pub_Topic = ")  + MQTT_Pub_Topic);
-      
-     }
-    else
-      Serial.println("Creating new Temperature object failed");
-  }
-}
-
 void loadConfigData(void)
 {
   File file = FileFS.open(CONFIG_FILENAME, "r");
@@ -1597,117 +1587,110 @@ void saveConfigData(void)
   }
 }
 
-uint8_t connectMultiWiFi(void)
+void deleteOldInstances(void)
 {
-#if ESP32
-  // For ESP32, this better be 0 to shorten the connect time
-  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       0
-#else
-  // For ESP8266, this better be 2200 to enable connect the 1st time
-  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       2200L
-#endif
-
-#define WIFI_MULTI_CONNECT_WAITING_MS           100L
-  
-  uint8_t status;
+  // Delete previous instances
+  if (mqtt)
+  {
+    delete mqtt;
+    mqtt = NULL;
+    
+    Serial.println(F("Deleting old MQTT object"));
+  }
 
-  LOGERROR(F("ConnectMultiWiFi with :"));
-  
-  if ( (Router_SSID != "") && (Router_Pass != "") )
+  if (Temperature)
   {
-    LOGERROR3(F("* Flash-stored Router_SSID = "), Router_SSID, F(", Router_Pass = "), Router_Pass );
+    delete Temperature;
+    Temperature = NULL;
+    
+    Serial.println(F("Deleting old Temperature object"));
   }
+}
 
-  for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
+void createNewInstances(void)
+{
+  if (!client)
   {
-    // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
-    if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
-    {
-      LOGERROR3(F("* Additional SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
-    }
+    client = new WiFiClient;
+    
+    Serial.print(F("\nCreating new WiFi client object : "));
+    Serial.println(client? F("OK") : F("failed"));
   }
   
-  LOGERROR(F("Connecting MultiWifi..."));
-
-  WiFi.mode(WIFI_STA);
-
-#if !USE_DHCP_IP    
-  #if USE_CONFIGURABLE_DNS
-    // Set static IP, Gateway, Subnetmask, DNS1 and DNS2. New in v1.0.5
-    WiFi.config(stationIP, gatewayIP, netMask, dns1IP, dns2IP);
-  #else
-    // Set static IP, Gateway, Subnetmask, Use auto DNS1 and DNS2.
-    WiFi.config(stationIP, gatewayIP, netMask);
-  #endif 
-#endif
-
-  int i = 0;
-  status = wifiMulti.run();
-  delay(WIFI_MULTI_1ST_CONNECT_WAITING_MS);
-
-  while ( ( i++ < 10 ) && ( status != WL_CONNECTED ) )
+  // Create new instances from new data
+  if (!mqtt)
   {
-    status = wifiMulti.run();
-
-    if ( status == WL_CONNECTED )
-      break;
+    // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
+    mqtt = new Adafruit_MQTT_Client(client, custom_AIO_SERVER, atoi(custom_AIO_SERVERPORT), custom_AIO_USERNAME, custom_AIO_KEY);
+    
+    Serial.print(F("Creating new MQTT object : "));
+    
+    if (mqtt)
+    {
+      Serial.println(F("OK"));
+      Serial.println(String("AIO_SERVER = ")    + custom_AIO_SERVER    + ", AIO_SERVERPORT = "  + custom_AIO_SERVERPORT);
+      Serial.println(String("AIO_USERNAME = ")  + custom_AIO_USERNAME  + ", AIO_KEY = "         + custom_AIO_KEY);
+    }
     else
-      delay(WIFI_MULTI_CONNECT_WAITING_MS);
+      Serial.println(F("Failed"));
   }
-
-  if ( status == WL_CONNECTED )
+  
+  if (!Temperature)
   {
-    LOGERROR1(F("WiFi connected after time: "), i);
-    LOGERROR3(F("SSID:"), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
-    LOGERROR3(F("Channel:"), WiFi.channel(), F(",IP address:"), WiFi.localIP() );
-  }
-  else
-    LOGERROR(F("WiFi not connected"));
-
-  return status;
-}
-
-//event handler functions for button
-static void handleClick() 
-{
-  Serial.println("Button clicked!");
-  wifi_manager();
-}
-
-static void handleDoubleClick() 
-{
-  Serial.println("Button double clicked!");
-}
-
-static void handleLongPressStop() 
-{
-  Serial.println("Button pressed for long time and then released!");
-  newConfigData();
+    Serial.print(F("Creating new MQTT_Pub_Topic,  Temperature = "));
+    Serial.println(MQTT_Pub_Topic);
+    
+    Temperature = new Adafruit_MQTT_Publish(mqtt, MQTT_Pub_Topic.c_str());
+ 
+    Serial.print(F("Creating new Temperature object : "));
+    
+    if (Temperature)
+    {
+      Serial.println(F("OK"));
+      Serial.println(String("Temperature MQTT_Pub_Topic = ")  + MQTT_Pub_Topic);
+    }
+    else
+      Serial.println(F("Failed"));
+    }
 }
 
-void wifi_manager()
+void wifi_manager() 
 {
-  Serial.println("\nConfiguration Portal requested.");
-  digitalWrite(BLUE_LED, LED_ON); // turn the LED on by making the voltage LOW to tell us we are in configuration mode.
+  Serial.println(F("\nConfig Portal requested."));
+  digitalWrite(LED_BUILTIN, LED_ON); // turn the LED on by making the voltage LOW to tell us we are in configuration mode.
 
   //Local intialization. Once its business is done, there is no need to keep it around
-  ESP_WiFiManager ESP_wifiManager("ConfigOnSwitchFS-MQTT");
+  ESP_WiFiManager ESP_wifiManager("ConfigOnDRD_FS-MQTT");;
 
   //Check if there is stored WiFi router/password credentials.
   //If not found, device will remain in configuration mode until switched off via webserver.
-  Serial.print("Opening Configuration Portal. ");
+  Serial.print(F("Opening Configuration Portal. "));
   
   Router_SSID = ESP_wifiManager.WiFi_SSID();
   Router_Pass = ESP_wifiManager.WiFi_Pass();
   
-  // From v1.1.0, Don't permit NULL password
-  if ( (Router_SSID != "") && (Router_Pass != "") )
+  // From v1.1.1, Don't permit NULL password
+  if ( !initialConfig && (Router_SSID != "") && (Router_Pass != "") )
   {
-    ESP_wifiManager.setConfigPortalTimeout(120); //If no access point name has been previously entered disable timeout.
+    //If valid AP credential and not DRD, set timeout 120s.
+    ESP_wifiManager.setConfigPortalTimeout(120);
     Serial.println("Got stored Credentials. Timeout 120s");
   }
   else
-    Serial.println("No stored Credentials. No timeout");
+  {
+    ESP_wifiManager.setConfigPortalTimeout(0);
+
+    Serial.print(F("No timeout : "));
+    
+    if (initialConfig)
+    {
+      Serial.println(F("DRD or No stored Credentials.."));
+    }
+    else
+    {
+      Serial.println(F("No stored Credentials."));
+    }
+  }
 
   //Local intialization. Once its business is done, there is no need to keep it around
 
@@ -1717,25 +1700,19 @@ void wifi_manager()
   // (*** we are not using <custom HTML> and <label placement> ***)
 
   // AIO_SERVER
-  ESP_WMParameter AIO_SERVER_FIELD(AIO_SERVER_Label, "AIO SERVER", custom_AIO_SERVER, custom_AIO_SERVER_LEN /*20*/);
+  ESP_WMParameter AIO_SERVER_FIELD(AIO_SERVER_Label, "AIO SERVER", custom_AIO_SERVER, custom_AIO_SERVER_LEN + 1);
 
-  // AIO_SERVERPORT (because it is int, it needs to be converted to string)
-  char convertedValue[5];
-  sprintf(convertedValue, "%d", custom_AIO_SERVERPORT);
-  ESP_WMParameter AIO_SERVERPORT_FIELD(AIO_SERVERPORT_Label, "AIO SERVER PORT", convertedValue, 5);
+  // AIO_SERVERPORT
+  ESP_WMParameter AIO_SERVERPORT_FIELD(AIO_SERVERPORT_Label, "AIO SERVER PORT", custom_AIO_SERVERPORT, custom_AIO_PORT_LEN + 1);
 
   // AIO_USERNAME
-  ESP_WMParameter AIO_USERNAME_FIELD(AIO_USERNAME_Label, "AIO USERNAME", custom_AIO_USERNAME, custom_AIO_USERNAME_LEN /*20*/);
+  ESP_WMParameter AIO_USERNAME_FIELD(AIO_USERNAME_Label, "AIO USERNAME", custom_AIO_USERNAME, custom_AIO_USERNAME_LEN + 1);
 
   // AIO_KEY
-  ESP_WMParameter AIO_KEY_FIELD(AIO_KEY_Label, "AIO KEY", custom_AIO_KEY, custom_AIO_KEY_LEN /*40*/);
-
-  // Just a quick hint
-  ESP_WMParameter hint_text("<small>*If you want to connect to already connected AP, leave SSID and password fields empty</small>");
+  ESP_WMParameter AIO_KEY_FIELD(AIO_KEY_Label, "AIO KEY", custom_AIO_KEY, custom_AIO_KEY_LEN + 1);
 
   // add all parameters here
-  // order of adding is important
-  ESP_wifiManager.addParameter(&hint_text);
+  // order of adding is not important
   ESP_wifiManager.addParameter(&AIO_SERVER_FIELD);
   ESP_wifiManager.addParameter(&AIO_SERVERPORT_FIELD);
   ESP_wifiManager.addParameter(&AIO_USERNAME_FIELD);
@@ -1775,15 +1752,18 @@ void wifi_manager()
   // and goes into a blocking loop awaiting configuration.
   // Once the user leaves the portal with the exit button
   // processing will continue
+  // SSID to uppercase
+  ssid.toUpperCase();
+  
   if (!ESP_wifiManager.startConfigPortal((const char *) ssid.c_str(), password))
   {
-    Serial.println("Not connected to WiFi but continuing anyway.");
+    Serial.println(F("Not connected to WiFi but continuing anyway."));
   }
   else
   {
     // If you get here you have connected to the WiFi
-    Serial.println("Connected...yeey :)");
-    Serial.print("Local IP: ");
+    Serial.println(F("Connected...yeey :)"));
+    Serial.print(F("Local IP: "));
     Serial.println(WiFi.localIP());
   }
 
@@ -1823,14 +1803,14 @@ void wifi_manager()
   // Getting posted form values and overriding local variables parameters
   // Config file is written regardless the connection state
   strcpy(custom_AIO_SERVER, AIO_SERVER_FIELD.getValue());
-  custom_AIO_SERVERPORT = atoi(AIO_SERVERPORT_FIELD.getValue());
+  strcpy(custom_AIO_SERVERPORT, AIO_SERVERPORT_FIELD.getValue());
   strcpy(custom_AIO_USERNAME, AIO_USERNAME_FIELD.getValue());
   strcpy(custom_AIO_KEY, AIO_KEY_FIELD.getValue());
-
+ 
   // Writing JSON config file to flash for next boot
   writeConfigFile();
 
-  digitalWrite(BLUE_LED, LED_OFF); // Turn LED off as we are not in configuration mode.
+  digitalWrite(LED_BUILTIN, LED_OFF); // Turn LED off as we are not in configuration mode.
 
   deleteOldInstances();
 
@@ -1845,7 +1825,7 @@ bool readConfigFile()
 
   if (!f)
   {
-    Serial.println("Configuration file not found");
+    Serial.println(F("Config File not found"));
     return false;
   }
   else
@@ -1869,9 +1849,10 @@ bool readConfigFile()
     
     if ( deserializeError )
     {
-      Serial.println("JSON parseObject() failed");
+      Serial.println(F("JSON parseObject() failed"));
       return false;
     }
+    
     serializeJson(json, Serial);
     
 #else
@@ -1879,12 +1860,14 @@ bool readConfigFile()
     DynamicJsonBuffer jsonBuffer;
     // Parse JSON string
     JsonObject& json = jsonBuffer.parseObject(buf.get());
+    
     // Test if parsing succeeds.
     if (!json.success())
     {
-      Serial.println("JSON parseObject() failed");
+      Serial.println(F("JSON parseObject() failed"));
       return false;
     }
+    
     json.printTo(Serial);
     
 #endif
@@ -1898,7 +1881,7 @@ bool readConfigFile()
 
     if (json.containsKey(AIO_SERVERPORT_Label))
     {
-      custom_AIO_SERVERPORT = json[AIO_SERVERPORT_Label];
+      strcpy(custom_AIO_SERVERPORT, json[AIO_SERVERPORT_Label]);
     }
 
     if (json.containsKey(AIO_USERNAME_Label))
@@ -1912,13 +1895,14 @@ bool readConfigFile()
     }
   }
   
-  Serial.println("\nConfig file was successfully parsed");
+  Serial.println(F("\nConfig File successfully parsed"));
+  
   return true;
 }
 
 bool writeConfigFile() 
 {
-  Serial.println("Saving config file");
+  Serial.println(F("Saving Config File"));
 
 #if (ARDUINOJSON_VERSION_MAJOR >= 6)
   DynamicJsonDocument json(1024);
@@ -1928,17 +1912,17 @@ bool writeConfigFile()
 #endif
 
   // JSONify local configuration parameters
-  json[AIO_SERVER_Label] = custom_AIO_SERVER;
-  json[AIO_SERVERPORT_Label] = custom_AIO_SERVERPORT;
-  json[AIO_USERNAME_Label] = custom_AIO_USERNAME;
-  json[AIO_KEY_Label] = custom_AIO_KEY;
+  json[AIO_SERVER_Label]      = custom_AIO_SERVER;
+  json[AIO_SERVERPORT_Label]  = custom_AIO_SERVERPORT;
+  json[AIO_USERNAME_Label]    = custom_AIO_USERNAME;
+  json[AIO_KEY_Label]         = custom_AIO_KEY;
 
   // Open file for writing
   File f = FileFS.open(CONFIG_FILE, "w");
 
   if (!f)
   {
-    Serial.println("Failed to open config file for writing");
+    Serial.println(F("Failed to open Config File for writing"));
     return false;
   }
 
@@ -1954,7 +1938,7 @@ bool writeConfigFile()
 
   f.close();
 
-  Serial.println("\nConfig file was successfully saved");
+  Serial.println(F("\nConfig File successfully saved"));
   return true;
 }
 
@@ -1964,10 +1948,14 @@ bool writeConfigFile()
 void newConfigData() 
 {
   Serial.println();
-  Serial.print("custom_AIO_SERVER: "); Serial.println(custom_AIO_SERVER);
-  Serial.print("custom_SERVERPORT: "); Serial.println(custom_AIO_SERVERPORT);
-  Serial.print("custom_USERNAME_KEY: "); Serial.println(custom_AIO_USERNAME);
-  Serial.print("custom_KEY: "); Serial.println(custom_AIO_KEY);
+  Serial.print(F("custom_AIO_SERVER: ")); 
+  Serial.println(custom_AIO_SERVER);
+  Serial.print(F("custom_SERVERPORT: ")); 
+  Serial.println(custom_AIO_SERVERPORT);
+  Serial.print(F("custom_USERNAME_KEY: ")); 
+  Serial.println(custom_AIO_USERNAME);
+  Serial.print(F("custom_KEY: ")); 
+  Serial.println(custom_AIO_KEY);
   Serial.println();
 }
 
@@ -1985,7 +1973,7 @@ void MQTT_connect()
     return;
   }
 
-  Serial.println("Connecting to WiFi MQTT (3 attempts)...");
+  Serial.println(F("Connecting to MQTT (3 attempts)..."));
 
   uint8_t attempt = 3;
   
@@ -1993,37 +1981,36 @@ void MQTT_connect()
   { 
     // connect will return 0 for connected
     Serial.println(mqtt->connectErrorString(ret));
-    Serial.println("Another attemtpt to connect to MQTT in 2 seconds...");
+    Serial.println(F("Another attemtpt to connect to MQTT in 2 seconds..."));
+    
     mqtt->disconnect();
     delay(2000);  // wait 2 seconds
     attempt--;
     
     if (attempt == 0) 
     {
-      Serial.println("WiFi MQTT connection failed. Continuing with program...");
+      Serial.println(F("MQTT connection failed. Continuing with program..."));
       return;
     }
   }
   
-  Serial.println("WiFi MQTT connection successful!");
+  Serial.println(F("MQTT connection successful!"));
 }
 
 // Setup function
 void setup()
 {
+  // Initialize the LED digital pin as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+
   // Put your setup code here, to run once
   Serial.begin(115200);
   while (!Serial);
 
-  Serial.print("\nStarting ConfigOnSwichFS_MQTT_Ptr using " + String(FS_Name));
+  Serial.print("\nStarting ConfigOnDRD_FS_MQTT_Ptr using " + String(FS_Name));
   Serial.println(" on " + String(ARDUINO_BOARD));
 
-  btn.attachClick(handleClick);
-  btn.attachDoubleClick(handleDoubleClick);
-  btn.attachLongPressStop(handleLongPressStop);
-
-  // Initialize the LED digital pin as an output.
-  pinMode(BLUE_LED, OUTPUT);
+  Serial.setDebugOutput(false);
 
   // Mount the filesystem
   if (FORMAT_FILESYSTEM)
@@ -2046,150 +2033,39 @@ void setup()
     FileFS.format();
 #endif
   }
-
+  
   if (!readConfigFile())
   {
-    Serial.println("Failed to read configuration file, using default values");
+    Serial.println(F("Can't read Config File, using default values"));
   }
 
-  unsigned long startedAt = millis();
-
-  //Here starts the WiFi Manager initialization
-  //Local intialization. Once its business is done, there is no need to keep it around
-  ESP_WiFiManager ESP_wifiManager("ConfigOnSwichFS-MQTT");
-
-  ESP_wifiManager.setDebugOutput(true);
-
-  // Use only to erase stored WiFi Credentials
-  //resetSettings();
-  //ESP_wifiManager.resetSettings();
-
-  //set custom ip for portal
-  //ESP_wifiManager.setAPStaticIPConfig(IPAddress(192, 168, 100, 1), IPAddress(192, 168, 100, 1), IPAddress(255, 255, 255, 0));
-
-  ESP_wifiManager.setMinimumSignalQuality(-1);
-
-  // From v1.0.10 only
-  // Set config portal channel, default = 1. Use 0 => random channel from 1-13
-  ESP_wifiManager.setConfigPortalChannel(0);
-  //////
-
-  //set custom ip for portal
-  //ESP_wifiManager.setAPStaticIPConfig(IPAddress(192, 168, 100, 1), IPAddress(192, 168, 100, 1), IPAddress(255, 255, 255, 0));
-    
-#if !USE_DHCP_IP    
-  #if USE_CONFIGURABLE_DNS
-    // Set static IP, Gateway, Subnetmask, DNS1 and DNS2. New in v1.0.5
-    ESP_wifiManager.setSTAStaticIPConfig(stationIP, gatewayIP, netMask, dns1IP, dns2IP);
-  #else
-    // Set static IP, Gateway, Subnetmask, Use auto DNS1 and DNS2.
-    ESP_wifiManager.setSTAStaticIPConfig(stationIP, gatewayIP, netMask);
-  #endif 
-#endif
-
-  // New from v1.1.1
-#if USING_CORS_FEATURE
-  ESP_wifiManager.setCORSHeader("Your Access-Control-Allow-Origin");
-#endif
+  drd = new DoubleResetDetector(DRD_TIMEOUT, DRD_ADDRESS);
 
-  // We can't use WiFi.SSID() in ESP32 as it's only valid after connected.
-  // SSID and Password stored in ESP32 wifi_ap_record_t and wifi_config_t are also cleared in reboot
-  // Have to create a new function to store in EEPROM/SPIFFS for this purpose
-  Router_SSID = ESP_wifiManager.WiFi_SSID();
-  Router_Pass = ESP_wifiManager.WiFi_Pass();
-
-  //Remove this line if you do not want to see WiFi password printed
-  Serial.println("Stored: SSID = " + Router_SSID + ", Pass = " + Router_Pass);
-
-  // SSID to uppercase
-  ssid.toUpperCase();
-
-  if (Router_SSID == "")
+  if (!drd)
   {
-    Serial.println("We haven't got any access point credentials, so get them now");
-
-    digitalWrite(BLUE_LED, LED_ON); // Turn led on as we are in configuration mode.
-
-    //it starts an access point
-    //and goes into a blocking loop awaiting configuration
-    if (!ESP_wifiManager.startConfigPortal((const char *) ssid.c_str(), password))
-      Serial.println("Not connected to WiFi but continuing anyway.");
-    else
-      Serial.println("WiFi connected...yeey :)");
-  }
-
-  // From v1.1.0, Don't permit NULL password
-  if ( (Router_SSID != "") && (Router_Pass != "") )
-  {
-    LOGERROR3(F("* Add SSID = "), Router_SSID, F(", PW = "), Router_Pass);
-    wifiMulti.addAP(Router_SSID.c_str(), Router_Pass.c_str());
-    
-    ESP_wifiManager.setConfigPortalTimeout(120); //If no access point name has been previously entered disable timeout.
-    Serial.println("Got stored Credentials. Timeout 120s for Config Portal");
+    Serial.println(F("Can't instantiate. Disable DRD feature"));
   }
-  else
+  else if (drd->detectDoubleReset())
   {
-    Serial.println("Open Config Portal without Timeout: No stored Credentials.");
+    // DRD, disable timeout.
+    //ESP_wifiManager.setConfigPortalTimeout(0);
     
+    Serial.println(F("Open Config Portal without Timeout: Double Reset Detected"));
     initialConfig = true;
   }
-
+ 
   if (initialConfig)
   {
-    Serial.println("Starting configuration portal.");
-    digitalWrite(BLUE_LED, LED_ON); // Turn led on as we are in configuration mode.
-
-    //sets timeout in seconds until configuration portal gets turned off.
-    //If not specified device will remain in configuration mode until
-    //switched off via webserver or device is restarted.
-    //ESP_wifiManager.setConfigPortalTimeout(600);
-
-    // Starts an access point
-    if (!ESP_wifiManager.startConfigPortal((const char *) ssid.c_str(), password))
-      Serial.println("Not connected to WiFi but continuing anyway.");
-    else
-    {
-      Serial.println("WiFi connected...yeey :)");
-    }
-
-    // Stored  for later usage, from v1.1.0, but clear first
-    memset(&WM_config, 0, sizeof(WM_config));
-    
-    for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
-    {
-      String tempSSID = ESP_wifiManager.getSSID(i);
-      String tempPW   = ESP_wifiManager.getPW(i);
-  
-      if (strlen(tempSSID.c_str()) < sizeof(WM_config.WiFi_Creds[i].wifi_ssid) - 1)
-        strcpy(WM_config.WiFi_Creds[i].wifi_ssid, tempSSID.c_str());
-      else
-        strncpy(WM_config.WiFi_Creds[i].wifi_ssid, tempSSID.c_str(), sizeof(WM_config.WiFi_Creds[i].wifi_ssid) - 1);
-
-      if (strlen(tempPW.c_str()) < sizeof(WM_config.WiFi_Creds[i].wifi_pw) - 1)
-        strcpy(WM_config.WiFi_Creds[i].wifi_pw, tempPW.c_str());
-      else
-        strncpy(WM_config.WiFi_Creds[i].wifi_pw, tempPW.c_str(), sizeof(WM_config.WiFi_Creds[i].wifi_pw) - 1);  
-
-      // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
-      if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
-      {
-        LOGERROR3(F("* Add SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
-        wifiMulti.addAP(WM_config.WiFi_Creds[i].wifi_ssid, WM_config.WiFi_Creds[i].wifi_pw);
-      }
-    }
-
-    saveConfigData();
+    wifi_manager();
   }
-
-  digitalWrite(BLUE_LED, LED_OFF); // Turn led off as we are not in configuration mode.
-
-  startedAt = millis();
-
-  if (!initialConfig)
+  else
   {
     // Load stored data, the addAP ready for MultiWiFi reconnection
     loadConfigData();
 
+    // Pretend CP is necessary as we have no AP Credentials
+    initialConfig = true;
+
     for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
     {
       // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
@@ -2197,10 +2073,17 @@ void setup()
       {
         LOGERROR3(F("* Add SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
         wifiMulti.addAP(WM_config.WiFi_Creds[i].wifi_ssid, WM_config.WiFi_Creds[i].wifi_pw);
+        initialConfig = false;
       }
     }
 
-    if ( WiFi.status() != WL_CONNECTED ) 
+    if (initialConfig)
+    {
+      Serial.println(F("Open Config Portal without Timeout: No stored WiFi Credentials"));
+    
+      wifi_manager();
+    }
+    else if ( WiFi.status() != WL_CONNECTED ) 
     {
       Serial.println("ConnectMultiWiFi in setup");
      
@@ -2208,24 +2091,18 @@ void setup()
     }
   }
 
-  Serial.print("After waiting ");
-  Serial.print((float) (millis() - startedAt) / 1000L);
-  Serial.print(" secs more in setup(), connection result is ");
-
-  if (WiFi.status() == WL_CONNECTED)
-  {
-    Serial.print("connected. Local IP: ");
-    Serial.println(WiFi.localIP());
-  }
-  else
-    Serial.println(ESP_wifiManager.getStatus(WiFi.status()));
+  digitalWrite(LED_BUILTIN, LED_OFF); // Turn led off as we are not in configuration mode.
 }
 
 // Loop function
 void loop()
 {
-  // checking button state all the time
-  btn.tick();
+  // Call the double reset detector loop method every so often,
+  // so that it can recognise when the timeout expires.
+  // You can also call drd.stop() when you wish to no longer
+  // consider the next reset as a double reset.
+  if (drd)
+    drd->loop();
 
   // this is just for checking if we are connected to WiFi
   check_status();
@@ -2233,6 +2110,7 @@ void loop()
 
 ```
 
+---
 ---
 
 ### Debug Termimal Output Samples
@@ -2326,7 +2204,7 @@ Local IP: 192.168.2.186
 Saving config file
 {
   "AIO_SERVER_Label": "io.adafruit.com",
-  "AIO_SERVERPORT_Label": 1883,
+  "AIO_SERVERPORT_Label": "1883",
   "AIO_USERNAME_Label": "account",
   "AIO_KEY_Label": "aio_key"
 }
@@ -2409,6 +2287,7 @@ HHHHHHHHHH HHHHHHHHHH HHHHHHHHHH HHHHHHHHHH
 ---
 
 ### Debug
+
 Debug is enabled by default on Serial. To disable, add before `startConfigPortal()`
 
 ```cpp
@@ -2425,6 +2304,7 @@ You can also change the debugging level from 0 to 4
 ---
 
 ### Troubleshooting
+
 If you get compilation errors, more often than not, you may need to install a newer version of the `ESP32 / ESP8266` core for Arduino.
 
 Sometimes, the library will only work if you update the `ESP32 / ESP8266` core to the latest version because I am using some newly added function.
@@ -2440,6 +2320,11 @@ Submit issues to: [ESP_WiFiManager issues](https://github.com/khoih-prog/ESP_WiF
 ---
 ---
 
+### Releases v1.1.2
+
+1. Fix bug in examples.
+2. Add example.
+
 ### Releases v1.1.1
 
 1. Add setCORSHeader function to allow **configurable CORS Header**. See [Using CORS feature](https://github.com/khoih-prog/ESP_WiFiManager#15-using-cors-cross-origin-resource-sharing-feature)
@@ -2544,7 +2429,7 @@ See [KenTaylor's version](https://github.com/kentaylor/WiFiManager) for previous
 6. Thanks to [AlesSt](https://github.com/AlesSt) for reporting then help provide the fixes:
   - [On Android phone ConfigPortal is unresponsive](https://github.com/khoih-prog/ESP_WiFiManager/issues/23) and request an enhancement (***HOWTO disable the static IP inputs on the config page***) leading to [ESP_WiFiManager v1.0.10](https://github.com/khoih-prog/ESP_WiFiManager/releases/tag/v1.0.10).
   - [Issue #25: API call /r doesnt clear credentials](https://github.com/khoih-prog/ESP_WiFiManager/issues/25), [Issue #26: softAP with custom IP not working](https://github.com/khoih-prog/ESP_WiFiManager/issues/26) and [Issue #27: CORS protection fires up with AJAX](https://github.com/khoih-prog/ESP_WiFiManager/issues/27) leading to [ESP_WiFiManager v1.0.11](https://github.com/khoih-prog/ESP_WiFiManager/releases/tag/v1.0.11).
-7. Thanks to [wackoo-arduino](https://github.com/wackoo-arduino) for agreeing to contribute the sample code dealing with MQTT which the  [ConfigOnSwitchFS_MQTT_Ptr](examples/ConfigOnSwitchFS_MQTT_Ptr) is based on. See [Custom MQTT parameters using Wifi Manager](https://forum.arduino.cc/index.php?topic=692108.75).
+7. Thanks to [Marko](https://github.com/wackoo-arduino) for agreeing to contribute the sample code dealing with MQTT which the  [ConfigOnSwitchFS_MQTT_Ptr](examples/ConfigOnSwitchFS_MQTT_Ptr) is based on. See [Custom MQTT parameters using Wifi Manager](https://forum.arduino.cc/index.php?topic=692108.75).
 8. Thanks to [05prateek](https://github.com/05prateek) for reporting [Stationmode Static IP changes to dhcp when esp8266 is restarted](https://github.com/khoih-prog/ESP_WiFiManager/issues/28) bug which is fixed in v1.0.11 by enhance autoConnect() function.
 
 
@@ -2552,15 +2437,15 @@ See [KenTaylor's version](https://github.com/kentaylor/WiFiManager) for previous
 <table>
   <tr>
     <td align="center"><a href="https://github.com/Tzapu"><img src="https://github.com/Tzapu.png" width="100px;" alt="Tzapu"/><br /><sub><b>⭐️ Tzapu</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/kentaylor"><img src="https://github.com/kentaylor.png" width="100px;" alt="kentaylor"/><br /><sub><b>⭐️ kentaylor</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/kentaylor"><img src="https://github.com/kentaylor.png" width="100px;" alt="kentaylor"/><br /><sub><b>⭐️ Ken Taylor</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/Amorphous"><img src="https://github.com/Amorphous.png" width="100px;" alt="Amorphous"/><br /><sub><b>⭐️ Amorphous</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/CrispinP"><img src="https://github.com/CrispinP.png" width="100px;" alt="CrispinP"/><br /><sub><b>CrispinP</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/OttoKlaasen"><img src="https://github.com/OttoKlaasen.png" width="100px;" alt="OttoKlaasen"/><br /><sub><b>OttoKlaasen</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/OttoKlaasen"><img src="https://github.com/OttoKlaasen.png" width="100px;" alt="OttoKlaasen"/><br /><sub><b>Otto Klaasen</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/Gius-8"><img src="https://github.com/Gius-8.png" width="100px;" alt="Giuseppe"/><br /><sub><b>Giuseppe</b></sub></a><br /></td>
     </tr>
     <tr>
     <td align="center"><a href="https://github.com/AlesSt"><img src="https://github.com/AlesSt.png" width="100px;" alt="AlesSt"/><br /><sub><b>⭐️ AlesSt</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/wackoo-arduino"><img src="https://github.com/wackoo-arduino.png" width="100px;" alt="wackoo-arduino"/><br /><sub><b>wackoo-arduino</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/wackoo-arduino"><img src="https://github.com/wackoo-arduino.png" width="100px;" alt="wackoo-arduino"/><br /><sub><b>Marko</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/05prateek"><img src="https://github.com/05prateek.png" width="100px;" alt="05prateek"/><br /><sub><b>05prateek</b></sub></a><br /></td>
   </tr> 
 </table>
@@ -2577,6 +2462,12 @@ If you want to contribute to this project:
 
 ---
 
+### License and credits ###
+
+- The library is licensed under [MIT](https://github.com/khoih-prog/WebSockets2_Generic/blob/master/LICENSE)
+
+---
+
 ## Copyright
 
 Copyright 2019- Khoi Hoang
diff --git a/examples/AutoConnect/AutoConnect.ino b/examples/AutoConnect/AutoConnect.ino
index b8b6b11..488d36a 100644
--- a/examples/AutoConnect/AutoConnect.ino
+++ b/examples/AutoConnect/AutoConnect.ino
@@ -10,25 +10,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 #if !( defined(ESP8266) ||  defined(ESP32) )
   #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
@@ -205,6 +204,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 
 #include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino
index e8630c2..90211b5 100644
--- a/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino
+++ b/examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino
@@ -10,25 +10,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 #if !( defined(ESP8266) ||  defined(ESP32) )
   #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
@@ -232,6 +231,9 @@ char blynk_token  [BLYNK_TOKEN_LEN]         = "YOUR_BLYNK_TOKEN";
 char mqtt_server  [MQTT_SERVER_MAX_LEN];
 char mqtt_port    [MQTT_SERVER_PORT_LEN]    = "8080";
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 //flag for saving data
 bool shouldSaveConfig = false;
 
@@ -462,7 +464,6 @@ void check_status()
   }
 }
 
-
 void loadConfigData(void)
 {
   File file = FileFS.open(CONFIG_FILENAME, "r");
@@ -592,7 +593,7 @@ void setup()
 #ifdef ESP8266
     FileFS.format();
 #endif
-  }  
+  }
 
   loadFileFSConfigFile();
 
diff --git a/examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino b/examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino
index 6508a3d..7f1fe40 100644
--- a/examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino
+++ b/examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino
@@ -10,25 +10,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 #if !( defined(ESP8266) ||  defined(ESP32) )
   #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
@@ -209,6 +208,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 
 #include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/AutoConnectWithFeedbackLED/AutoConnectWithFeedbackLED.ino b/examples/AutoConnectWithFeedbackLED/AutoConnectWithFeedbackLED.ino
index ba9f2ab..392b00a 100644
--- a/examples/AutoConnectWithFeedbackLED/AutoConnectWithFeedbackLED.ino
+++ b/examples/AutoConnectWithFeedbackLED/AutoConnectWithFeedbackLED.ino
@@ -10,25 +10,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 #if !( defined(ESP8266) ||  defined(ESP32) )
   #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
@@ -216,6 +215,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 #include <Ticker.h>
 Ticker ticker;
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void toggleLED()
 {
   //toggle state
diff --git a/examples/ConfigOnDRD_FS_MQTT_Ptr/ConfigOnDRD_FS_MQTT_Ptr.ino b/examples/ConfigOnDRD_FS_MQTT_Ptr/ConfigOnDRD_FS_MQTT_Ptr.ino
new file mode 100644
index 0000000..288dd41
--- /dev/null
+++ b/examples/ConfigOnDRD_FS_MQTT_Ptr/ConfigOnDRD_FS_MQTT_Ptr.ino
@@ -0,0 +1,1060 @@
+/****************************************************************************************************************************
+  ConfigOnDRD_FS_MQTT_Ptr.ino
+  For ESP8266 / ESP32 boards
+
+  ESP_WiFiManager is a library for the ESP8266/ESP32 platform (https://github.com/esp8266/Arduino) to enable easy
+  configuration and reconfiguration of WiFi credentials using a Captive Portal. Inspired by:
+  http://www.esp8266.com/viewtopic.php?f=29&t=2520
+  https://github.com/chriscook8/esp-arduino-apboot
+  https://github.com/esp8266/Arduino/blob/master/libraries/DNSServer/examples/CaptivePortalAdvanced/
+  
+  Modified from Tzapu https://github.com/tzapu/WiFiManager
+  and from Ken Taylor https://github.com/kentaylor
+  
+  Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
+  Licensed under MIT license
+  Version: 1.1.2
+
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
+ *****************************************************************************************************************************/
+/****************************************************************************************************************************
+  This example will open a Config Portal when there is no stored WiFi Credentials or when a DRD is detected.
+  
+  You can reconfigure to use another pin, such as the convenience FLASH / BOOT button @ PIN_D0;.
+   
+  A password is required to connect to the Config Portal so that only who know the password can access the Config Portal.
+  
+  The Credentials, being input via Config Portal, will then be saved into LittleFS / SPIFFS file, and be used to connect to 
+  Adafruit MQTT Server at "io.adafruit.com" and publish a Temperature Topic
+  
+  Based on original sketch posted by "Marko"(https://github.com/wackoo-arduino) on https://forum.arduino.cc/index.php?topic=692108
+ *****************************************************************************************************************************/
+
+#if !( defined(ESP8266) ||  defined(ESP32) )
+  #error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
+#endif
+
+// Use from 0 to 4. Higher number, more debugging messages and memory usage.
+#define _WIFIMGR_LOGLEVEL_    3
+
+#include <Arduino.h>            // for button
+#include <OneButton.h>          // for button
+
+#include <FS.h>
+
+// Now support ArduinoJson 6.0.0+ ( tested with v6.15.2 to v6.16.1 )
+#include <ArduinoJson.h>        // get it from https://arduinojson.org/ or install via Arduino library manager
+
+//For ESP32, To use ESP32 Dev Module, QIO, Flash 4MB/80MHz, Upload 921600
+//Ported to ESP32
+#ifdef ESP32
+  #include <esp_wifi.h>
+  #include <WiFi.h>
+  #include <WiFiClient.h>
+
+  // From v1.1.0
+  #include <WiFiMulti.h>
+  WiFiMulti wifiMulti;
+
+  #define USE_SPIFFS      true
+
+  #if USE_SPIFFS
+    #include <SPIFFS.h>
+    FS* filesystem =      &SPIFFS;
+    #define FileFS        SPIFFS
+    #define FS_Name       "SPIFFS"
+  #else
+    // Use FFat
+    #include <FFat.h>
+    FS* filesystem =      &FFat;
+    #define FileFS        FFat
+    #define FS_Name       "FFat"
+  #endif
+  //////
+
+  #define ESP_getChipId()   ((uint32_t)ESP.getEfuseMac())
+
+  #define LED_BUILTIN       2
+  #define LED_ON            HIGH
+  #define LED_OFF           LOW
+
+#else
+#include <ESP8266WiFi.h>          //https://github.com/esp8266/Arduino
+  //needed for library
+  #include <DNSServer.h>
+  #include <ESP8266WebServer.h>
+
+  // From v1.1.0
+  #include <ESP8266WiFiMulti.h>
+  ESP8266WiFiMulti wifiMulti;
+
+  #define USE_LITTLEFS      true
+  
+  #if USE_LITTLEFS
+    #include <LittleFS.h>
+    FS* filesystem = &LittleFS;
+    #define FileFS    LittleFS
+    #define FS_Name       "LittleFS"
+  #else
+    FS* filesystem = &SPIFFS;
+    #define FileFS    SPIFFS
+    #define FS_Name       "SPIFFS"
+  #endif
+  //////
+  
+  #define ESP_getChipId()   (ESP.getChipId())
+  
+  #define LED_ON      LOW
+  #define LED_OFF     HIGH
+#endif
+
+// These defines must be put before #include <ESP_DoubleResetDetector.h>
+// to select where to store DoubleResetDetector's variable.
+// For ESP32, You must select one to be true (EEPROM or SPIFFS)
+// For ESP8266, You must select one to be true (RTC, EEPROM, SPIFFS or LITTLEFS)
+// Otherwise, library will use default EEPROM storage
+#ifdef ESP32
+
+  // These defines must be put before #include <ESP_DoubleResetDetector.h>
+  // to select where to store DoubleResetDetector's variable.
+  // For ESP32, You must select one to be true (EEPROM or SPIFFS)
+  // Otherwise, library will use default EEPROM storage
+  #if USE_SPIFFS
+    #define ESP_DRD_USE_SPIFFS      true
+    #define ESP_DRD_USE_EEPROM      false
+  #else
+    #define ESP_DRD_USE_SPIFFS      false
+    #define ESP_DRD_USE_EEPROM      true
+  #endif
+  
+#else //ESP8266
+  
+  // For DRD
+  // These defines must be put before #include <ESP_DoubleResetDetector.h>
+  // to select where to store DoubleResetDetector's variable.
+  // For ESP8266, You must select one to be true (RTC, EEPROM, SPIFFS or LITTLEFS)
+  // Otherwise, library will use default EEPROM storage
+  #if USE_LITTLEFS
+    #define ESP_DRD_USE_LITTLEFS    true
+    #define ESP_DRD_USE_SPIFFS      false
+  #else
+    #define ESP_DRD_USE_LITTLEFS    false
+    #define ESP_DRD_USE_SPIFFS      true
+  #endif
+    
+  #define ESP_DRD_USE_EEPROM      false
+  #define ESP8266_DRD_USE_RTC     false
+#endif
+ 
+#define DOUBLERESETDETECTOR_DEBUG       true  //false
+
+#include <ESP_DoubleResetDetector.h>      //https://github.com/khoih-prog/ESP_DoubleResetDetector
+
+// Number of seconds after reset during which a
+// subseqent reset will be considered a double reset.
+#define DRD_TIMEOUT 10
+
+// RTC Memory Address for the DoubleResetDetector to use
+#define DRD_ADDRESS 0
+
+DoubleResetDetector* drd = NULL;
+
+#include "Adafruit_MQTT.h"                //https://github.com/adafruit/Adafruit_MQTT_Library
+#include "Adafruit_MQTT_Client.h"         //https://github.com/adafruit/Adafruit_MQTT_Library
+
+const char* CONFIG_FILE = "/ConfigMQTT.json";
+
+// Default configuration values for Adafruit IO MQTT
+// This actually works
+#define AIO_SERVER              "io.adafruit.com"
+#define AIO_SERVERPORT          "1883" //1883, or 8883 for SSL
+#define AIO_USERNAME            "private" //Adafruit IO
+#define AIO_KEY                 "private"
+
+// Labels for custom parameters in WiFi manager
+#define AIO_SERVER_Label             "AIO_SERVER_Label"
+#define AIO_SERVERPORT_Label         "AIO_SERVERPORT_Label"
+#define AIO_USERNAME_Label           "AIO_USERNAME_Label"
+#define AIO_KEY_Label                "AIO_KEY_Label"
+
+// Just dummy topics. To be updated later when got valid data from FS or Config Portal
+String MQTT_Pub_Topic   = "private/feeds/Temperature";
+
+// Variables to save custom parameters to...
+// I would like to use these instead of #defines
+#define custom_AIO_SERVER_LEN       20
+#define custom_AIO_PORT_LEN          5
+#define custom_AIO_USERNAME_LEN     20
+#define custom_AIO_KEY_LEN          40
+
+char custom_AIO_SERVER[custom_AIO_SERVER_LEN];
+char custom_AIO_SERVERPORT[custom_AIO_PORT_LEN];
+char custom_AIO_USERNAME[custom_AIO_USERNAME_LEN];
+char custom_AIO_KEY[custom_AIO_KEY_LEN];
+
+// Function Prototypes
+void MQTT_connect();
+bool readConfigFile();
+bool writeConfigFile();
+
+// For Config Portal
+// SSID and PW for Config Portal
+String ssid = "ESP_" + String(ESP_getChipId(), HEX);
+const char* password = "your_password";
+
+// SSID and PW for your Router
+String Router_SSID;
+String Router_Pass;
+
+// From v1.1.1
+// You only need to format the filesystem once
+//#define FORMAT_FILESYSTEM       true
+#define FORMAT_FILESYSTEM         false
+
+#define MIN_AP_PASSWORD_SIZE    8
+
+#define SSID_MAX_LEN            32
+//From v1.0.10, WPA2 passwords can be up to 63 characters long.
+#define PASS_MAX_LEN            64
+
+typedef struct
+{
+  char wifi_ssid[SSID_MAX_LEN];
+  char wifi_pw  [PASS_MAX_LEN];
+}  WiFi_Credentials;
+
+typedef struct
+{
+  String wifi_ssid;
+  String wifi_pw;
+}  WiFi_Credentials_String;
+
+#define NUM_WIFI_CREDENTIALS      2
+
+typedef struct
+{
+  WiFi_Credentials  WiFi_Creds [NUM_WIFI_CREDENTIALS];
+} WM_Config;
+
+WM_Config         WM_config;
+
+#define  CONFIG_FILENAME              F("/wifi_cred.dat")
+//////
+
+// Indicates whether ESP has WiFi credentials saved from previous session, or double reset detected
+bool initialConfig = false;
+
+// Use false if you don't like to display Available Pages in Information Page of Config Portal
+// Comment out or use true to display Available Pages in Information Page of Config Portal
+// Must be placed before #include <ESPAsync_WiFiManager.h>
+#define USE_AVAILABLE_PAGES     false
+
+// From v1.0.10 to permit disable/enable StaticIP configuration in Config Portal from sketch. Valid only if DHCP is used.
+// You'll loose the feature of dynamically changing from DHCP to static IP, or vice versa
+// You have to explicitly specify false to disable the feature.
+//#define USE_STATIC_IP_CONFIG_IN_CP          false
+
+// Use false to disable NTP config. Advisable when using Cellphone, Tablet to access Config Portal.
+// See Issue 23: On Android phone ConfigPortal is unresponsive (https://github.com/khoih-prog/ESP_WiFiManager/issues/23)
+#define USE_ESP_WIFIMANAGER_NTP     false
+
+// Use true to enable CloudFlare NTP service. System can hang if you don't have Internet access while accessing CloudFlare
+// See Issue #21: CloudFlare link in the default portal (https://github.com/khoih-prog/ESP_WiFiManager/issues/21)
+#define USE_CLOUDFLARE_NTP          false
+
+// New in v1.0.11
+#define USING_CORS_FEATURE          true
+//////
+
+// Use USE_DHCP_IP == true for dynamic DHCP IP, false to use static IP which you have to change accordingly to your network
+#if (defined(USE_STATIC_IP_CONFIG_IN_CP) && !USE_STATIC_IP_CONFIG_IN_CP)
+// Force DHCP to be true
+#if defined(USE_DHCP_IP)
+#undef USE_DHCP_IP
+#endif
+#define USE_DHCP_IP     true
+#else
+// You can select DHCP or Static IP here
+//#define USE_DHCP_IP     true
+#define USE_DHCP_IP     false
+#endif
+
+#if ( USE_DHCP_IP || ( defined(USE_STATIC_IP_CONFIG_IN_CP) && !USE_STATIC_IP_CONFIG_IN_CP ) )
+// Use DHCP
+#warning Using DHCP IP
+IPAddress stationIP   = IPAddress(0, 0, 0, 0);
+IPAddress gatewayIP   = IPAddress(192, 168, 2, 1);
+IPAddress netMask     = IPAddress(255, 255, 255, 0);
+#else
+// Use static IP
+#warning Using static IP
+#ifdef ESP32
+IPAddress stationIP   = IPAddress(192, 168, 2, 232);
+#else
+IPAddress stationIP   = IPAddress(192, 168, 2, 186);
+#endif
+
+IPAddress gatewayIP   = IPAddress(192, 168, 2, 1);
+IPAddress netMask     = IPAddress(255, 255, 255, 0);
+#endif
+
+#define USE_CONFIGURABLE_DNS      true
+
+IPAddress dns1IP      = gatewayIP;
+IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
+
+#include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
+
+#define HTTP_PORT           80
+
+// Create an ESP32 WiFiClient class to connect to the MQTT server
+WiFiClient *client                    = NULL;
+
+Adafruit_MQTT_Client    *mqtt         = NULL;
+Adafruit_MQTT_Publish   *Temperature  = NULL;
+
+// Forward Declaration
+
+uint8_t connectMultiWiFi(void)
+{
+#if ESP32
+  // For ESP32, this better be 0 to shorten the connect time
+  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       0
+#else
+  // For ESP8266, this better be 2200 to enable connect the 1st time
+  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       2200L
+#endif
+
+#define WIFI_MULTI_CONNECT_WAITING_MS           100L
+  
+  uint8_t status;
+
+  LOGERROR(F("ConnectMultiWiFi with :"));
+  
+  if ( (Router_SSID != "") && (Router_Pass != "") )
+  {
+    LOGERROR3(F("* Flash-stored Router_SSID = "), Router_SSID, F(", Router_Pass = "), Router_Pass );
+  }
+
+  for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
+  {
+    // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
+    if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
+    {
+      LOGERROR3(F("* Additional SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
+    }
+  }
+  
+  LOGERROR(F("Connecting MultiWifi..."));
+
+  WiFi.mode(WIFI_STA);
+
+#if !USE_DHCP_IP    
+  #if USE_CONFIGURABLE_DNS  
+    // Set static IP, Gateway, Subnetmask, DNS1 and DNS2. New in v1.0.5
+    WiFi.config(stationIP, gatewayIP, netMask, dns1IP, dns2IP);  
+  #else
+    // Set static IP, Gateway, Subnetmask, Use auto DNS1 and DNS2.
+    WiFi.config(stationIP, gatewayIP, netMask);
+  #endif 
+#endif
+
+  int i = 0;
+  status = wifiMulti.run();
+  delay(WIFI_MULTI_1ST_CONNECT_WAITING_MS);
+
+  while ( ( i++ < 20 ) && ( status != WL_CONNECTED ) )
+  {
+    status = wifiMulti.run();
+
+    if ( status == WL_CONNECTED )
+      break;
+    else
+      delay(WIFI_MULTI_CONNECT_WAITING_MS);
+  }
+
+  if ( status == WL_CONNECTED )
+  {
+    LOGERROR1(F("WiFi connected after time: "), i);
+    LOGERROR3(F("SSID:"), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
+    LOGERROR3(F("Channel:"), WiFi.channel(), F(",IP address:"), WiFi.localIP() );
+  }
+  else
+    LOGERROR(F("WiFi not connected"));
+
+  return status;
+}
+
+void toggleLED()
+{
+  //toggle state
+  digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
+}
+
+void heartBeatPrint(void)
+{
+  static int num = 1;
+
+  if (WiFi.status() == WL_CONNECTED)
+    Serial.print(F("W"));        // W means connected to WiFi
+  else
+    Serial.print(F("N"));        // N means not connected to WiFi
+
+  if (num == 40)
+  {
+    Serial.println();
+    num = 1;
+  }
+  else if (num++ % 5 == 0)
+  {
+    Serial.print(F(" "));
+  }
+}
+
+void publishMQTT(void)
+{
+    float some_number = 25.0 + (float) ( millis() % 100 ) /  100;
+
+    // For debug only
+    //Serial.print(F("Published Temp = "));
+    //Serial.println(some_number);
+    
+    MQTT_connect();
+
+    if (Temperature->publish(some_number)) 
+    {
+      Serial.print(F("T"));        // T means publishing OK
+    }
+    else 
+    {
+      Serial.print(F("F"));        // F means publishing failure
+    }
+}
+
+void check_WiFi(void)
+{
+  if ( (WiFi.status() != WL_CONNECTED) )
+  {
+    Serial.println(F("\nWiFi lost. Call connectMultiWiFi in loop"));
+    connectMultiWiFi();
+  }
+}  
+
+void check_status(void)
+{
+  static ulong checkstatus_timeout  = 0;
+  static ulong LEDstatus_timeout    = 0;
+  static ulong checkwifi_timeout    = 0;
+  static ulong mqtt_publish_timeout = 0;
+  
+  ulong current_millis = millis();
+
+#define WIFICHECK_INTERVAL    1000L
+#define LED_INTERVAL          2000L
+#define HEARTBEAT_INTERVAL    10000L
+#define PUBLISH_INTERVAL      60000L
+
+  // Check WiFi every WIFICHECK_INTERVAL (1) seconds.
+  if ((current_millis > checkwifi_timeout) || (checkwifi_timeout == 0))
+  {
+    check_WiFi();
+    checkwifi_timeout = current_millis + WIFICHECK_INTERVAL;
+  }
+
+  if ((current_millis > LEDstatus_timeout) || (LEDstatus_timeout == 0))
+  {
+    // Toggle LED at LED_INTERVAL = 2s
+    toggleLED();
+    LEDstatus_timeout = current_millis + LED_INTERVAL;
+  }
+
+  // Print hearbeat every HEARTBEAT_INTERVAL (10) seconds.
+  if ((current_millis > checkstatus_timeout) || (checkstatus_timeout == 0))
+  { 
+    heartBeatPrint();
+    checkstatus_timeout = current_millis + HEARTBEAT_INTERVAL;
+  }
+
+  // Check every PUBLISH_INTERVAL (60) seconds.
+  if ((current_millis > mqtt_publish_timeout) || (mqtt_publish_timeout == 0))
+  {
+    if (WiFi.status() == WL_CONNECTED)
+    {
+      publishMQTT();
+    }
+    
+    mqtt_publish_timeout = current_millis + PUBLISH_INTERVAL;
+  }
+}
+
+void loadConfigData(void)
+{
+  File file = FileFS.open(CONFIG_FILENAME, "r");
+  LOGERROR(F("LoadWiFiCfgFile "));
+
+  if (file)
+  {
+    file.readBytes((char *) &WM_config, sizeof(WM_config));
+    file.close();
+    LOGERROR(F("OK"));
+  }
+  else
+  {
+    LOGERROR(F("failed"));
+  }
+}
+    
+void saveConfigData(void)
+{
+  File file = FileFS.open(CONFIG_FILENAME, "w");
+  LOGERROR(F("SaveWiFiCfgFile "));
+
+  if (file)
+  {
+    file.write((uint8_t*) &WM_config, sizeof(WM_config));
+    file.close();
+    LOGERROR(F("OK"));
+  }
+  else
+  {
+    LOGERROR(F("failed"));
+  }
+}
+
+void deleteOldInstances(void)
+{
+  // Delete previous instances
+  if (mqtt)
+  {
+    delete mqtt;
+    mqtt = NULL;
+    
+    Serial.println(F("Deleting old MQTT object"));
+  }
+
+  if (Temperature)
+  {
+    delete Temperature;
+    Temperature = NULL;
+    
+    Serial.println(F("Deleting old Temperature object"));
+  }  
+}
+
+void createNewInstances(void)
+{
+  if (!client)
+  {
+    client = new WiFiClient;
+    
+    Serial.print(F("\nCreating new WiFi client object : "));
+    Serial.println(client? F("OK") : F("failed"));
+  }
+  
+  // Create new instances from new data
+  if (!mqtt)
+  {
+    // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
+    mqtt = new Adafruit_MQTT_Client(client, custom_AIO_SERVER, atoi(custom_AIO_SERVERPORT), custom_AIO_USERNAME, custom_AIO_KEY);
+    
+    Serial.print(F("Creating new MQTT object : "));
+    
+    if (mqtt)
+    {
+      Serial.println(F("OK"));
+      Serial.println(String("AIO_SERVER = ")    + custom_AIO_SERVER    + ", AIO_SERVERPORT = "  + custom_AIO_SERVERPORT);
+      Serial.println(String("AIO_USERNAME = ")  + custom_AIO_USERNAME  + ", AIO_KEY = "         + custom_AIO_KEY);
+    }
+    else
+      Serial.println(F("Failed"));
+  }
+  
+  if (!Temperature)
+  {
+    Serial.print(F("Creating new MQTT_Pub_Topic,  Temperature = "));
+    Serial.println(MQTT_Pub_Topic);
+    
+    Temperature = new Adafruit_MQTT_Publish(mqtt, MQTT_Pub_Topic.c_str());
+ 
+    Serial.print(F("Creating new Temperature object : "));
+    
+    if (Temperature)
+    {
+      Serial.println(F("OK"));
+      Serial.println(String("Temperature MQTT_Pub_Topic = ")  + MQTT_Pub_Topic);
+    }
+    else
+      Serial.println(F("Failed"));
+    }
+}
+
+void wifi_manager() 
+{
+  Serial.println(F("\nConfig Portal requested."));
+  digitalWrite(LED_BUILTIN, LED_ON); // turn the LED on by making the voltage LOW to tell us we are in configuration mode.
+
+  //Local intialization. Once its business is done, there is no need to keep it around
+  ESP_WiFiManager ESP_wifiManager("ConfigOnDRD_FS-MQTT");;
+
+  //Check if there is stored WiFi router/password credentials.
+  //If not found, device will remain in configuration mode until switched off via webserver.
+  Serial.print(F("Opening Configuration Portal. "));
+  
+  Router_SSID = ESP_wifiManager.WiFi_SSID();
+  Router_Pass = ESP_wifiManager.WiFi_Pass();
+  
+  // From v1.1.1, Don't permit NULL password
+  if ( !initialConfig && (Router_SSID != "") && (Router_Pass != "") )
+  {
+    //If valid AP credential and not DRD, set timeout 120s.
+    ESP_wifiManager.setConfigPortalTimeout(120);
+    Serial.println("Got stored Credentials. Timeout 120s");
+  }
+  else
+  {
+    ESP_wifiManager.setConfigPortalTimeout(0);
+
+    Serial.print(F("No timeout : "));
+    
+    if (initialConfig)
+    {
+      Serial.println(F("DRD or No stored Credentials.."));
+    }
+    else
+    {
+      Serial.println(F("No stored Credentials."));
+    }
+  }
+
+  //Local intialization. Once its business is done, there is no need to keep it around
+
+  // Extra parameters to be configured
+  // After connecting, parameter.getValue() will get you the configured value
+  // Format: <ID> <Placeholder text> <default value> <length> <custom HTML> <label placement>
+  // (*** we are not using <custom HTML> and <label placement> ***)
+
+  // AIO_SERVER
+  ESP_WMParameter AIO_SERVER_FIELD(AIO_SERVER_Label, "AIO SERVER", custom_AIO_SERVER, custom_AIO_SERVER_LEN + 1);
+
+  // AIO_SERVERPORT
+  ESP_WMParameter AIO_SERVERPORT_FIELD(AIO_SERVERPORT_Label, "AIO SERVER PORT", custom_AIO_SERVERPORT, custom_AIO_PORT_LEN + 1);
+
+  // AIO_USERNAME
+  ESP_WMParameter AIO_USERNAME_FIELD(AIO_USERNAME_Label, "AIO USERNAME", custom_AIO_USERNAME, custom_AIO_USERNAME_LEN + 1);
+
+  // AIO_KEY
+  ESP_WMParameter AIO_KEY_FIELD(AIO_KEY_Label, "AIO KEY", custom_AIO_KEY, custom_AIO_KEY_LEN + 1);
+
+  // add all parameters here
+  // order of adding is not important
+  ESP_wifiManager.addParameter(&AIO_SERVER_FIELD);
+  ESP_wifiManager.addParameter(&AIO_SERVERPORT_FIELD);
+  ESP_wifiManager.addParameter(&AIO_USERNAME_FIELD);
+  ESP_wifiManager.addParameter(&AIO_KEY_FIELD);
+
+  // Sets timeout in seconds until configuration portal gets turned off.
+  // If not specified device will remain in configuration mode until
+  // switched off via webserver or device is restarted.
+  //ESP_wifiManager.setConfigPortalTimeout(120);
+
+  ESP_wifiManager.setMinimumSignalQuality(-1);
+
+  // From v1.0.10 only
+  // Set config portal channel, default = 1. Use 0 => random channel from 1-13
+  ESP_wifiManager.setConfigPortalChannel(0);
+  //////
+  
+  //set custom ip for portal
+  //ESP_wifiManager.setAPStaticIPConfig(IPAddress(192, 168, 100, 1), IPAddress(192, 168, 100, 1), IPAddress(255, 255, 255, 0));
+  
+#if !USE_DHCP_IP    
+  #if USE_CONFIGURABLE_DNS
+    // Set static IP, Gateway, Subnetmask, DNS1 and DNS2. New in v1.0.5
+    ESP_wifiManager.setSTAStaticIPConfig(stationIP, gatewayIP, netMask, dns1IP, dns2IP);
+  #else
+    // Set static IP, Gateway, Subnetmask, Use auto DNS1 and DNS2.
+    ESP_wifiManager.setSTAStaticIPConfig(stationIP, gatewayIP, netMask);
+  #endif 
+#endif  
+
+  // New from v1.1.1
+#if USING_CORS_FEATURE
+  ESP_wifiManager.setCORSHeader("Your Access-Control-Allow-Origin");
+#endif
+
+  // Start an access point
+  // and goes into a blocking loop awaiting configuration.
+  // Once the user leaves the portal with the exit button
+  // processing will continue
+  // SSID to uppercase
+  ssid.toUpperCase();
+  
+  if (!ESP_wifiManager.startConfigPortal((const char *) ssid.c_str(), password))
+  {
+    Serial.println(F("Not connected to WiFi but continuing anyway."));
+  }
+  else
+  {
+    // If you get here you have connected to the WiFi
+    Serial.println(F("Connected...yeey :)"));
+    Serial.print(F("Local IP: "));
+    Serial.println(WiFi.localIP());
+  }
+
+  // Only clear then save data if CP entered and with new valid Credentials
+  // No CP => stored getSSID() = ""
+  if ( String(ESP_wifiManager.getSSID(0)) != "" && String(ESP_wifiManager.getSSID(1)) != "" )
+  {
+    // Stored  for later usage, from v1.1.0, but clear first
+    memset(&WM_config, 0, sizeof(WM_config));
+    
+    for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
+    {
+      String tempSSID = ESP_wifiManager.getSSID(i);
+      String tempPW   = ESP_wifiManager.getPW(i);
+  
+      if (strlen(tempSSID.c_str()) < sizeof(WM_config.WiFi_Creds[i].wifi_ssid) - 1)
+        strcpy(WM_config.WiFi_Creds[i].wifi_ssid, tempSSID.c_str());
+      else
+        strncpy(WM_config.WiFi_Creds[i].wifi_ssid, tempSSID.c_str(), sizeof(WM_config.WiFi_Creds[i].wifi_ssid) - 1);
+  
+      if (strlen(tempPW.c_str()) < sizeof(WM_config.WiFi_Creds[i].wifi_pw) - 1)
+        strcpy(WM_config.WiFi_Creds[i].wifi_pw, tempPW.c_str());
+      else
+        strncpy(WM_config.WiFi_Creds[i].wifi_pw, tempPW.c_str(), sizeof(WM_config.WiFi_Creds[i].wifi_pw) - 1);  
+  
+      // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
+      if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
+      {
+        LOGERROR3(F("* Add SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
+        wifiMulti.addAP(WM_config.WiFi_Creds[i].wifi_ssid, WM_config.WiFi_Creds[i].wifi_pw);
+      }
+    }
+  
+    saveConfigData();
+  }
+
+  // Getting posted form values and overriding local variables parameters
+  // Config file is written regardless the connection state
+  strcpy(custom_AIO_SERVER, AIO_SERVER_FIELD.getValue());
+  strcpy(custom_AIO_SERVERPORT, AIO_SERVERPORT_FIELD.getValue());
+  strcpy(custom_AIO_USERNAME, AIO_USERNAME_FIELD.getValue());
+  strcpy(custom_AIO_KEY, AIO_KEY_FIELD.getValue());
+ 
+  // Writing JSON config file to flash for next boot
+  writeConfigFile();
+
+  digitalWrite(LED_BUILTIN, LED_OFF); // Turn LED off as we are not in configuration mode.
+
+  deleteOldInstances();
+
+  MQTT_Pub_Topic = String(custom_AIO_USERNAME) + "/feeds/Temperature";
+  createNewInstances();
+}
+
+bool readConfigFile() 
+{
+  // this opens the config file in read-mode
+  File f = FileFS.open(CONFIG_FILE, "r");
+
+  if (!f)
+  {
+    Serial.println(F("Config File not found"));
+    return false;
+  }
+  else
+  {
+    // we could open the file
+    size_t size = f.size();
+    // Allocate a buffer to store contents of the file.
+    std::unique_ptr<char[]> buf(new char[size + 1]);
+
+    // Read and store file contents in buf
+    f.readBytes(buf.get(), size);
+    // Closing file
+    f.close();
+    // Using dynamic JSON buffer which is not the recommended memory model, but anyway
+    // See https://github.com/bblanchon/ArduinoJson/wiki/Memory%20model
+
+#if (ARDUINOJSON_VERSION_MAJOR >= 6)
+
+    DynamicJsonDocument json(1024);
+    auto deserializeError = deserializeJson(json, buf.get());
+    
+    if ( deserializeError )
+    {
+      Serial.println(F("JSON parseObject() failed"));
+      return false;
+    }
+    
+    serializeJson(json, Serial);
+    
+#else
+
+    DynamicJsonBuffer jsonBuffer;
+    // Parse JSON string
+    JsonObject& json = jsonBuffer.parseObject(buf.get());
+    
+    // Test if parsing succeeds.
+    if (!json.success())
+    {
+      Serial.println(F("JSON parseObject() failed"));
+      return false;
+    }
+    
+    json.printTo(Serial);
+    
+#endif
+
+    // Parse all config file parameters, override
+    // local config variables with parsed values
+    if (json.containsKey(AIO_SERVER_Label))
+    {
+      strcpy(custom_AIO_SERVER, json[AIO_SERVER_Label]);
+    }
+
+    if (json.containsKey(AIO_SERVERPORT_Label))
+    {
+      strcpy(custom_AIO_SERVERPORT, json[AIO_SERVERPORT_Label]);
+    }
+
+    if (json.containsKey(AIO_USERNAME_Label))
+    {
+      strcpy(custom_AIO_USERNAME, json[AIO_USERNAME_Label]);
+    }
+
+    if (json.containsKey(AIO_KEY_Label))
+    {
+      strcpy(custom_AIO_KEY, json[AIO_KEY_Label]);
+    }
+  }
+  
+  Serial.println(F("\nConfig File successfully parsed"));
+  
+  return true;
+}
+
+bool writeConfigFile() 
+{
+  Serial.println(F("Saving Config File"));
+
+#if (ARDUINOJSON_VERSION_MAJOR >= 6)
+  DynamicJsonDocument json(1024);
+#else
+  DynamicJsonBuffer jsonBuffer;
+  JsonObject& json = jsonBuffer.createObject();
+#endif
+
+  // JSONify local configuration parameters
+  json[AIO_SERVER_Label]      = custom_AIO_SERVER;
+  json[AIO_SERVERPORT_Label]  = custom_AIO_SERVERPORT;
+  json[AIO_USERNAME_Label]    = custom_AIO_USERNAME;
+  json[AIO_KEY_Label]         = custom_AIO_KEY;
+
+  // Open file for writing
+  File f = FileFS.open(CONFIG_FILE, "w");
+
+  if (!f)
+  {
+    Serial.println(F("Failed to open Config File for writing"));
+    return false;
+  }
+
+#if (ARDUINOJSON_VERSION_MAJOR >= 6)
+  serializeJsonPretty(json, Serial);
+  // Write data to file and close it
+  serializeJson(json, f);
+#else
+  json.prettyPrintTo(Serial);
+  // Write data to file and close it
+  json.printTo(f);
+#endif
+
+  f.close();
+
+  Serial.println(F("\nConfig File successfully saved"));
+  return true;
+}
+
+// this function is just to display newly saved data,
+// it is not necessary though, because data is displayed
+// after WiFi manager resets ESP32
+void newConfigData() 
+{
+  Serial.println();
+  Serial.print(F("custom_AIO_SERVER: ")); 
+  Serial.println(custom_AIO_SERVER);
+  Serial.print(F("custom_SERVERPORT: ")); 
+  Serial.println(custom_AIO_SERVERPORT);
+  Serial.print(F("custom_USERNAME_KEY: ")); 
+  Serial.println(custom_AIO_USERNAME);
+  Serial.print(F("custom_KEY: ")); 
+  Serial.println(custom_AIO_KEY);
+  Serial.println();
+}
+
+void MQTT_connect() 
+{
+  int8_t ret;
+
+  MQTT_Pub_Topic = String(custom_AIO_USERNAME) + "/feeds/Temperature";
+
+  createNewInstances();
+
+  // Return if already connected
+  if (mqtt->connected()) 
+  {
+    return;
+  }
+
+  Serial.println(F("Connecting to MQTT (3 attempts)..."));
+
+  uint8_t attempt = 3;
+  
+  while ((ret = mqtt->connect()) != 0) 
+  { 
+    // connect will return 0 for connected
+    Serial.println(mqtt->connectErrorString(ret));
+    Serial.println(F("Another attemtpt to connect to MQTT in 2 seconds..."));
+    
+    mqtt->disconnect();
+    delay(2000);  // wait 2 seconds
+    attempt--;
+    
+    if (attempt == 0) 
+    {
+      Serial.println(F("MQTT connection failed. Continuing with program..."));
+      return;
+    }
+  }
+  
+  Serial.println(F("MQTT connection successful!"));
+}
+
+// Setup function
+void setup()
+{
+  // Initialize the LED digital pin as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+
+  // Put your setup code here, to run once
+  Serial.begin(115200);
+  while (!Serial);
+
+  Serial.print("\nStarting ConfigOnDRD_FS_MQTT_Ptr using " + String(FS_Name));
+  Serial.println(" on " + String(ARDUINO_BOARD));
+
+  Serial.setDebugOutput(false);
+
+  // Mount the filesystem
+  if (FORMAT_FILESYSTEM)
+  {
+    Serial.println(F("Forced Formatting."));
+    FileFS.format();
+  }
+
+  // Format FileFS if not yet
+#ifdef ESP32
+  if (!FileFS.begin(true))
+#else
+  if (!FileFS.begin())
+#endif  
+  {
+    Serial.print(FS_Name);
+    Serial.println(F(" failed! AutoFormatting."));
+    
+#ifdef ESP8266
+    FileFS.format();
+#endif
+  }
+  
+  if (!readConfigFile())
+  {
+    Serial.println(F("Can't read Config File, using default values"));
+  }
+
+  drd = new DoubleResetDetector(DRD_TIMEOUT, DRD_ADDRESS);
+
+  if (!drd)
+  {
+    Serial.println(F("Can't instantiate. Disable DRD feature"));
+  }
+  else if (drd->detectDoubleReset())
+  {
+    // DRD, disable timeout.
+    //ESP_wifiManager.setConfigPortalTimeout(0);
+    
+    Serial.println(F("Open Config Portal without Timeout: Double Reset Detected"));
+    initialConfig = true;
+  }
+ 
+  if (initialConfig)
+  {
+    wifi_manager();
+  }
+  else
+  {   
+    // Load stored data, the addAP ready for MultiWiFi reconnection
+    loadConfigData();
+
+    // Pretend CP is necessary as we have no AP Credentials
+    initialConfig = true;
+
+    for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
+    {
+      // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
+      if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
+      {
+        LOGERROR3(F("* Add SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
+        wifiMulti.addAP(WM_config.WiFi_Creds[i].wifi_ssid, WM_config.WiFi_Creds[i].wifi_pw);
+        initialConfig = false;
+      }
+    }
+
+    if (initialConfig)
+    {
+      Serial.println(F("Open Config Portal without Timeout: No stored WiFi Credentials"));
+    
+      wifi_manager();
+    }
+    else if ( WiFi.status() != WL_CONNECTED ) 
+    {
+      Serial.println("ConnectMultiWiFi in setup");
+     
+      connectMultiWiFi();
+    }
+  }
+
+  digitalWrite(LED_BUILTIN, LED_OFF); // Turn led off as we are not in configuration mode.   
+}
+
+// Loop function
+void loop()
+{
+  // Call the double reset detector loop method every so often,
+  // so that it can recognise when the timeout expires.
+  // You can also call drd.stop() when you wish to no longer
+  // consider the next reset as a double reset.
+  if (drd)
+    drd->loop();
+
+  // this is just for checking if we are connected to WiFi
+  check_status();
+}
diff --git a/examples/ConfigOnDoubleReset/ConfigOnDoubleReset.ino b/examples/ConfigOnDoubleReset/ConfigOnDoubleReset.ino
index 1b5efc2..1ef74cd 100644
--- a/examples/ConfigOnDoubleReset/ConfigOnDoubleReset.ino
+++ b/examples/ConfigOnDoubleReset/ConfigOnDoubleReset.ino
@@ -13,25 +13,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /****************************************************************************************************************************
    This example will open a configuration portal when the reset button is pressed twice.
@@ -289,6 +288,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 
 #include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/ConfigOnStartup/ConfigOnStartup.ino b/examples/ConfigOnStartup/ConfigOnStartup.ino
index 9062fdf..78d2caa 100644
--- a/examples/ConfigOnStartup/ConfigOnStartup.ino
+++ b/examples/ConfigOnStartup/ConfigOnStartup.ino
@@ -13,25 +13,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /****************************************************************************************************************************
    This example will open a configuration portal for 60 seconds when first powered up if the boards has stored WiFi Credentials.
@@ -242,6 +241,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 // Onboard LED I/O pin on NodeMCU board
 const int PIN_LED = 2; // D4 on NodeMCU and WeMos. GPIO2/ADC12 of ESP32. Controls the onboard LED.
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/ConfigOnSwitch/ConfigOnSwitch.ino b/examples/ConfigOnSwitch/ConfigOnSwitch.ino
index 7b12217..3e46517 100644
--- a/examples/ConfigOnSwitch/ConfigOnSwitch.ino
+++ b/examples/ConfigOnSwitch/ConfigOnSwitch.ino
@@ -13,25 +13,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /****************************************************************************************************************************
    This example will open a configuration portal when no WiFi configuration has been previously entered or when a button is pushed.
@@ -298,15 +297,15 @@ bool initialConfig = false;
 
 // Use USE_DHCP_IP == true for dynamic DHCP IP, false to use static IP which you have to change accordingly to your network
 #if (defined(USE_STATIC_IP_CONFIG_IN_CP) && !USE_STATIC_IP_CONFIG_IN_CP)
-// Force DHCP to be true
-#if defined(USE_DHCP_IP)
-#undef USE_DHCP_IP
-#endif
-#define USE_DHCP_IP     true
+  // Force DHCP to be true
+  #if defined(USE_DHCP_IP)
+    #undef USE_DHCP_IP
+  #endif
+  #define USE_DHCP_IP     true
 #else
-// You can select DHCP or Static IP here
-//#define USE_DHCP_IP     true
-#define USE_DHCP_IP     false
+  // You can select DHCP or Static IP here
+  //#define USE_DHCP_IP     true
+  #define USE_DHCP_IP     false
 #endif
 
 #if ( USE_DHCP_IP || ( defined(USE_STATIC_IP_CONFIG_IN_CP) && !USE_STATIC_IP_CONFIG_IN_CP ) )
@@ -335,6 +334,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 
 #include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/ConfigOnSwitchFS/ConfigOnSwitchFS.ino b/examples/ConfigOnSwitchFS/ConfigOnSwitchFS.ino
index bdf1945..8d02a7f 100644
--- a/examples/ConfigOnSwitchFS/ConfigOnSwitchFS.ino
+++ b/examples/ConfigOnSwitchFS/ConfigOnSwitchFS.ino
@@ -13,25 +13,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /****************************************************************************************************************************
    This example will open a configuration portal when the reset button is pressed twice.
@@ -385,6 +384,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 
 #include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/ConfigOnSwitchFS_MQTT_Ptr/ConfigOnSwitchFS_MQTT_Ptr.ino b/examples/ConfigOnSwitchFS_MQTT_Ptr/ConfigOnSwitchFS_MQTT_Ptr.ino
index 226d177..c393048 100644
--- a/examples/ConfigOnSwitchFS_MQTT_Ptr/ConfigOnSwitchFS_MQTT_Ptr.ino
+++ b/examples/ConfigOnSwitchFS_MQTT_Ptr/ConfigOnSwitchFS_MQTT_Ptr.ino
@@ -13,25 +13,26 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version: 1.1.2
+
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /****************************************************************************************************************************
    This example will open a configuration portal when no WiFi configuration has been previously entered or when a button is pushed.
@@ -231,7 +232,6 @@
 #endif    //ESP32
 
 uint32_t timer = millis();
-int some_number = 5;
 
 const char* CONFIG_FILE = "/ConfigMQTT.json";
 
@@ -241,7 +241,7 @@ bool initialConfig = true; //default false
 // Default configuration values for Adafruit IO MQTT
 // This actually works
 #define AIO_SERVER              "io.adafruit.com"
-#define AIO_SERVERPORT          1883 //1883, or 8883 for SSL
+#define AIO_SERVERPORT          "1883" //1883, or 8883 for SSL
 #define AIO_USERNAME            "private" //Adafruit IO
 #define AIO_KEY                 "private"
 
@@ -254,19 +254,22 @@ bool initialConfig = true; //default false
 // Just dummy topics. To be updated later when got valid data from FS or Config Portal
 String MQTT_Pub_Topic   = "private/feeds/Temperature";
 
+// Variables to save custom parameters to...
+// I would like to use these instead of #defines
 // Variables to save custom parameters to...
 // I would like to use these instead of #defines
 #define custom_AIO_SERVER_LEN       20
+#define custom_AIO_PORT_LEN          5
 #define custom_AIO_USERNAME_LEN     20
 #define custom_AIO_KEY_LEN          40
 
 char custom_AIO_SERVER[custom_AIO_SERVER_LEN];
-int  custom_AIO_SERVERPORT;
+char custom_AIO_SERVERPORT[custom_AIO_PORT_LEN];
 char custom_AIO_USERNAME[custom_AIO_USERNAME_LEN];
 char custom_AIO_KEY[custom_AIO_KEY_LEN];
 
 // Function Prototypes
-
+void MQTT_connect();
 bool readConfigFile();
 bool writeConfigFile();
 
@@ -405,6 +408,82 @@ WiFiClient *client                    = NULL;
 Adafruit_MQTT_Client    *mqtt         = NULL;
 Adafruit_MQTT_Publish   *Temperature  = NULL;
 
+uint8_t connectMultiWiFi(void)
+{
+#if ESP32
+  // For ESP32, this better be 0 to shorten the connect time
+  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       0
+#else
+  // For ESP8266, this better be 2200 to enable connect the 1st time
+  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       2200L
+#endif
+
+#define WIFI_MULTI_CONNECT_WAITING_MS           100L
+  
+  uint8_t status;
+
+  LOGERROR(F("ConnectMultiWiFi with :"));
+  
+  if ( (Router_SSID != "") && (Router_Pass != "") )
+  {
+    LOGERROR3(F("* Flash-stored Router_SSID = "), Router_SSID, F(", Router_Pass = "), Router_Pass );
+  }
+
+  for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
+  {
+    // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
+    if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
+    {
+      LOGERROR3(F("* Additional SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
+    }
+  }
+  
+  LOGERROR(F("Connecting MultiWifi..."));
+
+  WiFi.mode(WIFI_STA);
+
+#if !USE_DHCP_IP    
+  #if USE_CONFIGURABLE_DNS  
+    // Set static IP, Gateway, Subnetmask, DNS1 and DNS2. New in v1.0.5
+    WiFi.config(stationIP, gatewayIP, netMask, dns1IP, dns2IP);  
+  #else
+    // Set static IP, Gateway, Subnetmask, Use auto DNS1 and DNS2.
+    WiFi.config(stationIP, gatewayIP, netMask);
+  #endif 
+#endif
+
+  int i = 0;
+  status = wifiMulti.run();
+  delay(WIFI_MULTI_1ST_CONNECT_WAITING_MS);
+
+  while ( ( i++ < 10 ) && ( status != WL_CONNECTED ) )
+  {
+    status = wifiMulti.run();
+
+    if ( status == WL_CONNECTED )
+      break;
+    else
+      delay(WIFI_MULTI_CONNECT_WAITING_MS);
+  }
+
+  if ( status == WL_CONNECTED )
+  {
+    LOGERROR1(F("WiFi connected after time: "), i);
+    LOGERROR3(F("SSID:"), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
+    LOGERROR3(F("Channel:"), WiFi.channel(), F(",IP address:"), WiFi.localIP() );
+  }
+  else
+    LOGERROR(F("WiFi not connected"));
+
+  return status;
+}
+
+void toggleLED()
+{
+  //toggle state
+  digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
+}
+
 void heartBeatPrint(void)
 {
   static int num = 1;
@@ -427,18 +506,24 @@ void heartBeatPrint(void)
 
 void publishMQTT(void)
 {
-    MQTT_connect();
+  float some_number = 25.0 + (float) ( millis() % 100 ) /  100;
 
-    if (Temperature->publish(some_number)) 
-    {
-      //Serial.println(F("Failed to send value to Temperature feed!"));
-      Serial.print("T");        // T means publishing OK
-    }
-    else 
-    {
-      //Serial.println(F("Value to Temperature feed sucessfully sent!"));
-      Serial.print("F");        // F means publishing failure
-    }
+  // For debug only
+  //Serial.print(F("Published Temp = "));
+  //Serial.println(some_number);
+    
+  MQTT_connect();
+  
+  if (Temperature->publish(some_number)) 
+  {
+    //Serial.println(F("Failed to send value to Temperature feed!"));
+    Serial.print("T");        // T means publishing OK
+  }
+  else 
+  {
+    //Serial.println(F("Value to Temperature feed sucessfully sent!"));
+    Serial.print("F");        // F means publishing failure
+  }
 }
 
 void check_WiFi(void)
@@ -453,12 +538,14 @@ void check_WiFi(void)
 void check_status(void)
 {
   static ulong checkstatus_timeout  = 0;
+  static ulong LEDstatus_timeout    = 0;
   static ulong checkwifi_timeout    = 0;
   static ulong mqtt_publish_timeout = 0;
   
   ulong current_millis = millis();
 
 #define WIFICHECK_INTERVAL    1000L
+#define LED_INTERVAL          2000L
 #define HEARTBEAT_INTERVAL    10000L
 #define PUBLISH_INTERVAL      60000L
 
@@ -469,6 +556,13 @@ void check_status(void)
     checkwifi_timeout = current_millis + WIFICHECK_INTERVAL;
   }
 
+  if ((current_millis > LEDstatus_timeout) || (LEDstatus_timeout == 0))
+  {
+    // Toggle LED at LED_INTERVAL = 2s
+    toggleLED();
+    LEDstatus_timeout = current_millis + LED_INTERVAL;
+  }
+
   // Print hearbeat every HEARTBEAT_INTERVAL (10) seconds.
   if ((current_millis > checkstatus_timeout) || (checkstatus_timeout == 0))
   { 
@@ -488,70 +582,6 @@ void check_status(void)
   }
 }
 
-void deleteOldInstances(void)
-{
-  // Delete previous instances
-  if (mqtt)
-  {
-    delete mqtt;
-    mqtt = NULL;
-    Serial.println("Deleting old MQTT object");
-  }
-
-  if (Temperature)
-  {
-    delete Temperature;
-    Temperature = NULL;
-    Serial.println("Deleting old Temperature object");
-  }
-}
-
-void createNewInstances(void)
-{
-  if (!client)
-  {
-    client = new WiFiClient;
-
-    if (client)
-    {
-      Serial.println("\nCreating new WiFi client object OK");
-    }
-    else
-      Serial.println("\nCreating new WiFi client object failed");
-  }
-
-  // Create new instances from new data
-  if (!mqtt)
-  {
-    // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
-    mqtt = new Adafruit_MQTT_Client(client, custom_AIO_SERVER, custom_AIO_SERVERPORT, custom_AIO_USERNAME, custom_AIO_KEY);
-
-    if (mqtt)
-    {
-      Serial.println("Creating new MQTT object OK");
-      Serial.println(String("AIO_SERVER = ")    + custom_AIO_SERVER    + ", AIO_SERVERPORT = "  + custom_AIO_SERVERPORT);
-      Serial.println(String("AIO_USERNAME = ")  + custom_AIO_USERNAME  + ", AIO_KEY = "         + custom_AIO_KEY);
-    }
-    else
-      Serial.println("Creating new MQTT object failed");
-  }
-
-  if (!Temperature)
-  {
-    Temperature = new Adafruit_MQTT_Publish(mqtt, MQTT_Pub_Topic.c_str());
-    Serial.println("Creating new MQTT_Pub_Topic,  Temperature = " + MQTT_Pub_Topic);
-
-     if (Temperature)
-     {
-      Serial.println("Creating new Temperature object OK");
-      Serial.println(String("Temperature MQTT_Pub_Topic = ")  + MQTT_Pub_Topic);
-      
-     }
-    else
-      Serial.println("Creating new Temperature object failed");
-  }
-}
-
 void loadConfigData(void)
 {
   File file = FileFS.open(CONFIG_FILENAME, "r");
@@ -586,74 +616,71 @@ void saveConfigData(void)
   }
 }
 
-uint8_t connectMultiWiFi(void)
+void deleteOldInstances(void)
 {
-#if ESP32
-  // For ESP32, this better be 0 to shorten the connect time
-  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       0
-#else
-  // For ESP8266, this better be 2200 to enable connect the 1st time
-  #define WIFI_MULTI_1ST_CONNECT_WAITING_MS       2200L
-#endif
-
-#define WIFI_MULTI_CONNECT_WAITING_MS           100L
-  
-  uint8_t status;
+  // Delete previous instances
+  if (mqtt)
+  {
+    delete mqtt;
+    mqtt = NULL;
+    
+    Serial.println("Deleting old MQTT object");
+  }
 
-  LOGERROR(F("ConnectMultiWiFi with :"));
-  
-  if ( (Router_SSID != "") && (Router_Pass != "") )
+  if (Temperature)
   {
-    LOGERROR3(F("* Flash-stored Router_SSID = "), Router_SSID, F(", Router_Pass = "), Router_Pass );
+    delete Temperature;
+    Temperature = NULL;
+    
+    Serial.println("Deleting old Temperature object");
   }
+}
 
-  for (uint8_t i = 0; i < NUM_WIFI_CREDENTIALS; i++)
+void createNewInstances(void)
+{
+  if (!client)
   {
-    // Don't permit NULL SSID and password len < MIN_AP_PASSWORD_SIZE (8)
-    if ( (String(WM_config.WiFi_Creds[i].wifi_ssid) != "") && (strlen(WM_config.WiFi_Creds[i].wifi_pw) >= MIN_AP_PASSWORD_SIZE) )
-    {
-      LOGERROR3(F("* Additional SSID = "), WM_config.WiFi_Creds[i].wifi_ssid, F(", PW = "), WM_config.WiFi_Creds[i].wifi_pw );
-    }
+    client = new WiFiClient;
+    
+    Serial.print(F("\nCreating new WiFi client object : "));
+    Serial.println(client? F("OK") : F("failed"));
   }
   
-  LOGERROR(F("Connecting MultiWifi..."));
-
-  WiFi.mode(WIFI_STA);
-
-#if !USE_DHCP_IP    
-  #if USE_CONFIGURABLE_DNS  
-    // Set static IP, Gateway, Subnetmask, DNS1 and DNS2. New in v1.0.5
-    WiFi.config(stationIP, gatewayIP, netMask, dns1IP, dns2IP);  
-  #else
-    // Set static IP, Gateway, Subnetmask, Use auto DNS1 and DNS2.
-    WiFi.config(stationIP, gatewayIP, netMask);
-  #endif 
-#endif
-
-  int i = 0;
-  status = wifiMulti.run();
-  delay(WIFI_MULTI_1ST_CONNECT_WAITING_MS);
-
-  while ( ( i++ < 10 ) && ( status != WL_CONNECTED ) )
+  // Create new instances from new data
+  if (!mqtt)
   {
-    status = wifiMulti.run();
-
-    if ( status == WL_CONNECTED )
-      break;
+    // Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
+    mqtt = new Adafruit_MQTT_Client(client, custom_AIO_SERVER, atoi(custom_AIO_SERVERPORT), custom_AIO_USERNAME, custom_AIO_KEY);
+    
+    Serial.print(F("Creating new MQTT object : "));
+    
+    if (mqtt)
+    {
+      Serial.println(F("OK"));
+      Serial.println(String("AIO_SERVER = ")    + custom_AIO_SERVER    + ", AIO_SERVERPORT = "  + custom_AIO_SERVERPORT);
+      Serial.println(String("AIO_USERNAME = ")  + custom_AIO_USERNAME  + ", AIO_KEY = "         + custom_AIO_KEY);
+    }
     else
-      delay(WIFI_MULTI_CONNECT_WAITING_MS);
+      Serial.println(F("Failed"));
   }
-
-  if ( status == WL_CONNECTED )
+  
+  if (!Temperature)
   {
-    LOGERROR1(F("WiFi connected after time: "), i);
-    LOGERROR3(F("SSID:"), WiFi.SSID(), F(",RSSI="), WiFi.RSSI());
-    LOGERROR3(F("Channel:"), WiFi.channel(), F(",IP address:"), WiFi.localIP() );
-  }
-  else
-    LOGERROR(F("WiFi not connected"));
-
-  return status;
+    Serial.print(F("Creating new MQTT_Pub_Topic,  Temperature = "));
+    Serial.println(MQTT_Pub_Topic);
+    
+    Temperature = new Adafruit_MQTT_Publish(mqtt, MQTT_Pub_Topic.c_str());
+ 
+    Serial.print(F("Creating new Temperature object : "));
+    
+    if (Temperature)
+    {
+      Serial.println(F("OK"));
+      Serial.println(String("Temperature MQTT_Pub_Topic = ")  + MQTT_Pub_Topic);
+    }
+    else
+      Serial.println(F("Failed"));
+    }
 }
 
 //event handler functions for button
@@ -676,8 +703,8 @@ static void handleLongPressStop()
 
 void wifi_manager()
 {
-  Serial.println("\nConfiguration Portal requested.");
-  digitalWrite(BLUE_LED, LED_ON); // turn the LED on by making the voltage LOW to tell us we are in configuration mode.
+  Serial.println(F("\nConfig Portal requested."));
+  digitalWrite(LED_BUILTIN, LED_ON); // turn the LED on by making the voltage LOW to tell us we are in configuration mode.
 
   //Local intialization. Once its business is done, there is no need to keep it around
   ESP_WiFiManager ESP_wifiManager("ConfigOnSwitchFS-MQTT");
@@ -708,10 +735,8 @@ void wifi_manager()
   // AIO_SERVER
   ESP_WMParameter AIO_SERVER_FIELD(AIO_SERVER_Label, "AIO SERVER", custom_AIO_SERVER, custom_AIO_SERVER_LEN /*20*/);
 
-  // AIO_SERVERPORT (because it is int, it needs to be converted to string)
-  char convertedValue[5];
-  sprintf(convertedValue, "%d", custom_AIO_SERVERPORT);
-  ESP_WMParameter AIO_SERVERPORT_FIELD(AIO_SERVERPORT_Label, "AIO SERVER PORT", convertedValue, 5);
+  // AIO_SERVERPORT
+  ESP_WMParameter AIO_SERVERPORT_FIELD(AIO_SERVERPORT_Label, "AIO SERVER PORT", custom_AIO_SERVERPORT, custom_AIO_PORT_LEN + 1);
 
   // AIO_USERNAME
   ESP_WMParameter AIO_USERNAME_FIELD(AIO_USERNAME_Label, "AIO USERNAME", custom_AIO_USERNAME, custom_AIO_USERNAME_LEN /*20*/);
@@ -719,12 +744,6 @@ void wifi_manager()
   // AIO_KEY
   ESP_WMParameter AIO_KEY_FIELD(AIO_KEY_Label, "AIO KEY", custom_AIO_KEY, custom_AIO_KEY_LEN /*40*/);
 
-  // Just a quick hint
-  ESP_WMParameter hint_text("<small>*If you want to connect to already connected AP, leave SSID and password fields empty</small>");
-
-  // add all parameters here
-  // order of adding is important
-  ESP_wifiManager.addParameter(&hint_text);
   ESP_wifiManager.addParameter(&AIO_SERVER_FIELD);
   ESP_wifiManager.addParameter(&AIO_SERVERPORT_FIELD);
   ESP_wifiManager.addParameter(&AIO_USERNAME_FIELD);
@@ -812,14 +831,14 @@ void wifi_manager()
   // Getting posted form values and overriding local variables parameters
   // Config file is written regardless the connection state
   strcpy(custom_AIO_SERVER, AIO_SERVER_FIELD.getValue());
-  custom_AIO_SERVERPORT = atoi(AIO_SERVERPORT_FIELD.getValue());
+  strcpy(custom_AIO_SERVERPORT, AIO_SERVERPORT_FIELD.getValue());
   strcpy(custom_AIO_USERNAME, AIO_USERNAME_FIELD.getValue());
   strcpy(custom_AIO_KEY, AIO_KEY_FIELD.getValue());
 
   // Writing JSON config file to flash for next boot
   writeConfigFile();
 
-  digitalWrite(BLUE_LED, LED_OFF); // Turn LED off as we are not in configuration mode.
+  digitalWrite(LED_BUILTIN, LED_OFF); // Turn LED off as we are not in configuration mode.
 
   deleteOldInstances();
 
@@ -887,7 +906,7 @@ bool readConfigFile()
 
     if (json.containsKey(AIO_SERVERPORT_Label))
     {
-      custom_AIO_SERVERPORT = json[AIO_SERVERPORT_Label];
+      strcpy(custom_AIO_SERVERPORT, json[AIO_SERVERPORT_Label]);
     }
 
     if (json.containsKey(AIO_USERNAME_Label))
@@ -917,10 +936,10 @@ bool writeConfigFile()
 #endif
 
   // JSONify local configuration parameters
-  json[AIO_SERVER_Label] = custom_AIO_SERVER;
-  json[AIO_SERVERPORT_Label] = custom_AIO_SERVERPORT;
-  json[AIO_USERNAME_Label] = custom_AIO_USERNAME;
-  json[AIO_KEY_Label] = custom_AIO_KEY;
+  json[AIO_SERVER_Label]      = custom_AIO_SERVER;
+  json[AIO_SERVERPORT_Label]  = custom_AIO_SERVERPORT;
+  json[AIO_USERNAME_Label]    = custom_AIO_USERNAME;
+  json[AIO_KEY_Label]         = custom_AIO_KEY;
 
   // Open file for writing
   File f = FileFS.open(CONFIG_FILE, "w");
@@ -953,10 +972,14 @@ bool writeConfigFile()
 void newConfigData() 
 {
   Serial.println();
-  Serial.print("custom_AIO_SERVER: "); Serial.println(custom_AIO_SERVER);
-  Serial.print("custom_SERVERPORT: "); Serial.println(custom_AIO_SERVERPORT);
-  Serial.print("custom_USERNAME_KEY: "); Serial.println(custom_AIO_USERNAME);
-  Serial.print("custom_KEY: "); Serial.println(custom_AIO_KEY);
+  Serial.print(F("custom_AIO_SERVER: ")); 
+  Serial.println(custom_AIO_SERVER);
+  Serial.print(F("custom_SERVERPORT: ")); 
+  Serial.println(custom_AIO_SERVERPORT);
+  Serial.print(F("custom_USERNAME_KEY: ")); 
+  Serial.println(custom_AIO_USERNAME);
+  Serial.print(F("custom_KEY: ")); 
+  Serial.println(custom_AIO_KEY);
   Serial.println();
 }
 
@@ -1097,7 +1120,7 @@ void setup()
   {
     Serial.println("We haven't got any access point credentials, so get them now");
 
-    digitalWrite(BLUE_LED, LED_ON); // Turn led on as we are in configuration mode.
+    digitalWrite(LED_BUILTIN, LED_ON); // Turn led on as we are in configuration mode.
 
     //it starts an access point
     //and goes into a blocking loop awaiting configuration
@@ -1126,7 +1149,7 @@ void setup()
   if (initialConfig)
   {
     Serial.println("Starting configuration portal.");
-    digitalWrite(BLUE_LED, LED_ON); // Turn led on as we are in configuration mode.
+    digitalWrite(LED_BUILTIN, LED_ON); // Turn led on as we are in configuration mode.
 
     //sets timeout in seconds until configuration portal gets turned off.
     //If not specified device will remain in configuration mode until
@@ -1170,7 +1193,7 @@ void setup()
     saveConfigData();
   }
 
-  digitalWrite(BLUE_LED, LED_OFF); // Turn led off as we are not in configuration mode.
+  digitalWrite(LED_BUILTIN, LED_OFF); // Turn led off as we are not in configuration mode.
 
   startedAt = millis();
 
diff --git a/examples/ConfigPortalParamsOnSwitch/ConfigPortalParamsOnSwitch.ino b/examples/ConfigPortalParamsOnSwitch/ConfigPortalParamsOnSwitch.ino
index 65e1800..b279f83 100644
--- a/examples/ConfigPortalParamsOnSwitch/ConfigPortalParamsOnSwitch.ino
+++ b/examples/ConfigPortalParamsOnSwitch/ConfigPortalParamsOnSwitch.ino
@@ -13,25 +13,24 @@
   
   Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
   Licensed under MIT license
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /****************************************************************************************************************************
    This example will open a configuration portal when a predetermined button is pressed
@@ -358,9 +357,9 @@ IPAddress dns2IP      = IPAddress(8, 8, 8, 8);
 #include <ESP_WiFiManager.h>              //https://github.com/khoih-prog/ESP_WiFiManager
 
 // Function Prototypes
-
-bool readConfigFile();
-bool writeConfigFile();
+uint8_t connectMultiWiFi(void);
+bool    readConfigFile(void);
+bool    writeConfigFile(void);
 
 void heartBeatPrint(void)
 {
diff --git a/examples/ESP32_FSWebServer/ESP32_FSWebServer.ino b/examples/ESP32_FSWebServer/ESP32_FSWebServer.ino
index dd5edd4..c0b90e1 100644
--- a/examples/ESP32_FSWebServer/ESP32_FSWebServer.ino
+++ b/examples/ESP32_FSWebServer/ESP32_FSWebServer.ino
@@ -27,25 +27,24 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /*****************************************************************************************************************************
    How To Use:
@@ -218,6 +217,9 @@ WebServer server(HTTP_PORT);
 //holds the current upload
 File fsUploadFile;
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/ESP32_FSWebServer_DRD/ESP32_FSWebServer_DRD.ino b/examples/ESP32_FSWebServer_DRD/ESP32_FSWebServer_DRD.ino
index 072921a..bc27281 100644
--- a/examples/ESP32_FSWebServer_DRD/ESP32_FSWebServer_DRD.ino
+++ b/examples/ESP32_FSWebServer_DRD/ESP32_FSWebServer_DRD.ino
@@ -27,25 +27,24 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /*****************************************************************************************************************************
    How To Use:
@@ -245,6 +244,9 @@ WebServer server(HTTP_PORT);
 //holds the current upload
 File fsUploadFile;
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/ESP_FSWebServer/ESP_FSWebServer.ino b/examples/ESP_FSWebServer/ESP_FSWebServer.ino
index a8b0444..8c408db 100644
--- a/examples/ESP_FSWebServer/ESP_FSWebServer.ino
+++ b/examples/ESP_FSWebServer/ESP_FSWebServer.ino
@@ -27,25 +27,24 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /*****************************************************************************************************************************
    How To Use:
@@ -215,6 +214,9 @@ ESP8266WebServer server(80);
 //holds the current upload
 File fsUploadFile;
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/examples/ESP_FSWebServer_DRD/ESP_FSWebServer_DRD.ino b/examples/ESP_FSWebServer_DRD/ESP_FSWebServer_DRD.ino
index 46a17ba..2198689 100644
--- a/examples/ESP_FSWebServer_DRD/ESP_FSWebServer_DRD.ino
+++ b/examples/ESP_FSWebServer_DRD/ESP_FSWebServer_DRD.ino
@@ -27,25 +27,24 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 /*****************************************************************************************************************************
    How To Use:
@@ -246,6 +245,9 @@ ESP8266WebServer server(80);
 //holds the current upload
 File fsUploadFile;
 
+// Function Prototypes
+uint8_t connectMultiWiFi(void);
+
 void heartBeatPrint(void)
 {
   static int num = 1;
diff --git a/library.json b/library.json
index ba964b6..f8c3c8f 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP_WifiManager",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "keywords": "wifi, WiFiManager, esp8266, esp32",
   "description": "ESP32, ESP8266 MultiWiFi Connection Manager with enhanced GUI and fallback web ConfigPortal. This Library is used for configuring ESP32, ESP8266 modules MultiWiFi Credentials at runtime. You can also specify static DNS servers, personalized HostName, fixed or random AP channel. Now with MultiWiFi auto(Re)connect feature and configurable CORS Header.",
   "authors":
@@ -14,6 +14,14 @@
     "type": "git",
     "url": "https://github.com/khoih-prog/ESP_WiFiManager"
   },
+  "homepage": "https://github.com/khoih-prog/ESP_WiFiManager",
+  "export": {
+    "exclude": [
+      "linux",
+      "extras",
+      "tests"
+    ]
+  }, 
   "frameworks": "*",
   "platforms": "espressif",
   "examples": "examples/*/*/*.ino"
diff --git a/library.properties b/library.properties
index a5acb59..0048e3c 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ESP_WiFiManager
-version=1.1.1
+version=1.1.2
 author=Khoi Hoang
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 license=MIT
diff --git a/src/ESP_WiFiManager-Impl.h b/src/ESP_WiFiManager-Impl.h
index abf0c96..a2bb130 100644
--- a/src/ESP_WiFiManager-Impl.h
+++ b/src/ESP_WiFiManager-Impl.h
@@ -15,25 +15,26 @@
 
    Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
    Licensed under MIT license
-   Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+   Version: 1.1.2
+
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 
 #ifndef ESP_WiFiManager_Impl_h
diff --git a/src/ESP_WiFiManager.h b/src/ESP_WiFiManager.h
index 44b24af..c1f7b7b 100644
--- a/src/ESP_WiFiManager.h
+++ b/src/ESP_WiFiManager.h
@@ -15,25 +15,26 @@
 
    Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
    Licensed under MIT license
-   Version: 1.1.1
-
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+   Version: 1.1.2
+
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 
 #ifndef ESP_WiFiManager_h
diff --git a/src/ESP_WiFiManager_Debug.h b/src/ESP_WiFiManager_Debug.h
index 175dc6b..c093b1e 100644
--- a/src/ESP_WiFiManager_Debug.h
+++ b/src/ESP_WiFiManager_Debug.h
@@ -15,25 +15,26 @@
 
    Built by Khoi Hoang https://github.com/khoih-prog/ESP_WiFiManager
    Licensed under MIT license
-   Version: 1.1.1
+   Version: 1.1.2
 
-   Version Modified By   Date      Comments
-   ------- -----------  ---------- -----------
-    1.0.0   K Hoang      07/10/2019 Initial coding
-    1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
-    1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
-    1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
-    1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
-    1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
-    1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
-    1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
-    1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
-    1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
-                                    Add, enhance examples (fix MDNS for ESP32)
-    1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
-    1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
-    1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
-    1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  Version Modified By   Date      Comments
+  ------- -----------  ---------- -----------
+  1.0.0   K Hoang      07/10/2019 Initial coding
+  1.0.1   K Hoang      13/12/2019 Fix bug. Add features. Add support for ESP32
+  1.0.2   K Hoang      19/12/2019 Fix bug thatkeeps ConfigPortal in endless loop if Portal/Router SSID or Password is NULL.
+  1.0.3   K Hoang      05/01/2020 Option not displaying AvailablePages in Info page. Enhance README.md. Modify examples
+  1.0.4   K Hoang      07/01/2020 Add RFC952 setHostname feature.
+  1.0.5   K Hoang      15/01/2020 Add configurable DNS feature. Thanks to @Amorphous of https://community.blynk.cc
+  1.0.6   K Hoang      03/02/2020 Add support for ArduinoJson version 6.0.0+ ( tested with v6.14.1 )
+  1.0.7   K Hoang      13/04/2020 Reduce start time, fix SPIFFS bug in examples, update README.md
+  1.0.8   K Hoang      10/06/2020 Fix STAstaticIP issue. Restructure code. Add LittleFS support for ESP8266 core 2.7.1+
+  1.0.9   K Hoang      29/07/2020 Fix ESP32 STAstaticIP bug. Permit changing from DHCP <-> static IP using Config Portal.
+                                  Add, enhance examples (fix MDNS for ESP32)
+  1.0.10  K Hoang      08/08/2020 Add more features to Config Portal. Use random WiFi AP channel to avoid conflict.
+  1.0.11  K Hoang      17/08/2020 Add CORS feature. Fix bug in softAP, autoConnect, resetSettings.
+  1.1.0   K Hoang      28/08/2020 Add MultiWiFi feature to autoconnect to best WiFi at runtime
+  1.1.1   K Hoang      30/08/2020 Add setCORSHeader function to allow flexible CORS. Fix typo and minor improvement.
+  1.1.2   K Hoang      17/08/2020 Fix bug. Add example.
  *****************************************************************************************************************************/
 
 #ifndef ESP_WiFiManager_Debug_H