diff --git a/README.md b/README.md
index 5557da0..10da7f6 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,9 @@ First attempt at a library. Lots more changes and fixes to do. Contributions are
 - choose one of the access points scanned, enter password, click save
 - ESP will try to connect. If successful, it relinquishes control back to your app. If not, reconnect to AP and reconfigure.
 
+## How It Looks
+![ESP8266 WiFi Captive Portal Homepage](http://i.imgur.com/YPvW9eql.png) ![ESP8266 WiFi Captive Portal Configuration](http://i.imgur.com/oicWJ4gl.png)
+
 ## Wishlist
 - [x] remove dependency on EEPROM library
 - [x] move HTML Strings to PROGMEM
diff --git a/examples/.DS_Store b/examples/.DS_Store
index d369dc2..fcd6f5a 100644
Binary files a/examples/.DS_Store and b/examples/.DS_Store differ
diff --git a/examples/Basic_WiFiManager/Basic_WiFiManager.ino b/examples/Basic_WiFiManager/Basic_WiFiManager.ino
deleted file mode 100755
index ed7b60e..0000000
--- a/examples/Basic_WiFiManager/Basic_WiFiManager.ino
+++ /dev/null
@@ -1,159 +0,0 @@
-/*  NETPIE ESP8266 basic sample                            */
-/*  More information visit : https://netpie.io             */
-
-#include <ESP8266WiFi.h>
-#include <MicroGear.h>
-
-//needed for library
-#include <DNSServer.h>
-#include <ESP8266WebServer.h>
-#include <EEPROM.h>
-#include <WiFiManager.h>          //https://github.com/tzapu/WiFiManager
-
-//for LED status
-#include <Ticker.h>
-Ticker ticker;
-
-#define APPID   "APPID"
-#define KEY     "APPKEY"
-#define SECRET  "APPSECRET"
-#define ALIAS   "esp8266"
-
-WiFiClient client;
-
-int timer = 0;
-MicroGear microgear(client);
-
-void tick()
-{
-  //toggle state
-  int state = digitalRead(BUILTIN_LED);  // get the current state of GPIO1 pin
-  digitalWrite(BUILTIN_LED, !state);     // set pin to the opposite state
-}
-
-//gets called when WiFiManager enters configuration mode
-void configModeCallback (WiFiManager *myWiFiManager) {
-  Serial.println("Entered config mode");
-  Serial.println(WiFi.softAPIP());
-  //if you used auto generated SSID, print it
-  Serial.println(myWiFiManager->getConfigPortalSSID());
-  //entered config mode, make led toggle faster
-  ticker.attach(0.2, tick);
-}
-
-/* If a new message arrives, do this */
-void onMsghandler(char *topic, uint8_t* msg, unsigned int msglen) {
-    Serial.print("Incoming message --> ");
-    msg[msglen] = '\0';
-    Serial.println((char *)msg);
-}
-
-void onFoundgear(char *attribute, uint8_t* msg, unsigned int msglen) {
-    Serial.print("Found new member --> ");
-    for (int i=0; i<msglen; i++)
-        Serial.print((char)msg[i]);
-    Serial.println();  
-}
-
-void onLostgear(char *attribute, uint8_t* msg, unsigned int msglen) {
-    Serial.print("Lost member --> ");
-    for (int i=0; i<msglen; i++)
-        Serial.print((char)msg[i]);
-    Serial.println();
-}
-
-/* When a microgear is connected, do this */
-void onConnected(char *attribute, uint8_t* msg, unsigned int msglen) {
-    Serial.println("Connected to NETPIE...");
-    /* Set the alias of this microgear ALIAS */
-    microgear.setAlias(ALIAS);
-    ticker.attach(1, tick);
-}
-
-
-void setup() {
-    /* Add Event listeners */
-
-    /* Call onMsghandler() when new message arraives */
-    microgear.on(MESSAGE,onMsghandler);
-
-    /* Call onFoundgear() when new gear appear */
-    microgear.on(PRESENT,onFoundgear);
-
-    /* Call onLostgear() when some gear goes offline */
-    microgear.on(ABSENT,onLostgear);
-
-    /* Call onConnected() when NETPIE connection is established */
-    microgear.on(CONNECTED,onConnected);
-
-    Serial.begin(115200);
-    Serial.println("Starting...");
-
-    //set led pin as output
-    pinMode(BUILTIN_LED, OUTPUT);
-    // start ticker with 0.5 because we start in AP mode and try to connect
-    ticker.attach(0.7, tick);
-  
-    //WiFiManager
-    //Local intialization. Once its business is done, there is no need to keep it around
-    WiFiManager wifiManager(192);
-    //set timeout 180 sec.
-    wifiManager.setTimeout(180);
-    //reset settings - for testing
-    //wifiManager.resetSettings();
-  
-    //set callback that gets called when connecting to previous WiFi fails, and enters Access Point mode
-    wifiManager.setAPCallback(configModeCallback);
-  
-    //fetches ssid and pass and tries to connect
-    //if it does not connect it starts an access point with the specified name
-    //here  "AutoConnectAP"
-    //and goes into a blocking loop awaiting configuration
-    if (!wifiManager.autoConnect()) {
-      Serial.println("failed to connect and hit timeout");
-      //reset and try again, or maybe put it to deep sleep
-      //ESP.reset();
-      delay(1000);
-    }
-
-    //if you get here you have connected to the WiFi
-    Serial.println("connected...yeey :)");
-    ticker.detach();
-    //keep LED on
-    digitalWrite(BUILTIN_LED, LOW);
-
-    /* Initial with KEY, SECRET and also set the ALIAS here */
-    microgear.init(KEY,SECRET,ALIAS);
-
-    /* connect to NETPIE to a specific APPID */
-    microgear.connect(APPID);
-}
-
-void loop() {
-    /* To check if the microgear is still connected */
-    if (microgear.connected()) {
-        Serial.println("connected");
-
-        /* Call this method regularly otherwise the connection may be lost */
-        microgear.loop();
-
-        if (timer >= 1000) {
-            Serial.println("Publish...");
-
-            /* Chat with the microgear named ALIAS which is myself */
-            microgear.chat(ALIAS,"Hello");
-            timer = 0;
-        } 
-        else timer += 100;
-    }
-    else {
-        Serial.println("connection lost, reconnect...");
-        if (timer >= 5000) {
-            microgear.connect(APPID);
-            timer = 0;
-        }
-        else timer += 100;
-        ticker.detach();
-    }
-    delay(100);
-}
diff --git a/examples/Basic_WiFiManager_DisconnectWiFi/Basic_WiFiManager_DisconnectWiFi.ino b/examples/Basic_WiFiManager_DisconnectWiFi/Basic_WiFiManager_DisconnectWiFi.ino
deleted file mode 100755
index 5f4d8b7..0000000
--- a/examples/Basic_WiFiManager_DisconnectWiFi/Basic_WiFiManager_DisconnectWiFi.ino
+++ /dev/null
@@ -1,178 +0,0 @@
-/*  NETPIE ESP8266 basic sample                            */
-/*  More information visit : https://netpie.io             */
-
-#include <ESP8266WiFi.h>
-#include <MicroGear.h>
-
-//needed for library
-#include <DNSServer.h>
-#include <ESP8266WebServer.h>
-#include <EEPROM.h>
-#include <WiFiManager.h>          //https://github.com/tzapu/WiFiManager
-
-//for LED status
-#include <Ticker.h>
-Ticker ticker;
-
-#define APPID   "APPID"
-#define KEY     "APPKEY"
-#define SECRET  "APPSECRET"
-#define ALIAS   "esp8266dev"
-
-WiFiClient client;
-
-int timer = 0;
-int timeoutConnection = 0;
-MicroGear microgear(client);
-
-void tick()
-{
-  //toggle state
-  int state = digitalRead(BUILTIN_LED);  // get the current state of GPIO1 pin
-  digitalWrite(BUILTIN_LED, !state);     // set pin to the opposite state
-}
-
-//gets called when WiFiManager enters configuration mode
-void configModeCallback (WiFiManager *myWiFiManager) {
-  Serial.println("Entered config mode");
-  Serial.println(WiFi.softAPIP());
-  //if you used auto generated SSID, print it
-  Serial.println(myWiFiManager->getConfigPortalSSID());
-  //entered config mode, make led toggle faster
-  ticker.attach(0.2, tick);
-}
-
-/* If a new message arrives, do this */
-void onMsghandler(char *topic, uint8_t* msg, unsigned int msglen) {
-    Serial.print("Incoming message --> ");
-    msg[msglen] = '\0';
-    Serial.println((char *)msg);
-}
-
-void onFoundgear(char *attribute, uint8_t* msg, unsigned int msglen) {
-    Serial.print("Found new member --> ");
-    for (int i=0; i<msglen; i++)
-        Serial.print((char)msg[i]);
-    Serial.println();  
-}
-
-void onLostgear(char *attribute, uint8_t* msg, unsigned int msglen) {
-    Serial.print("Lost member --> ");
-    for (int i=0; i<msglen; i++)
-        Serial.print((char)msg[i]);
-    Serial.println();
-}
-
-/* When a microgear is connected, do this */
-void onConnected(char *attribute, uint8_t* msg, unsigned int msglen) {
-    Serial.println("Connected to NETPIE...");
-    /* Set the alias of this microgear ALIAS */
-    microgear.setAlias(ALIAS);
-    ticker.attach(1, tick);
-    timeoutConnection=0;
-}
-
-void initWiFi(){
-    //WiFiManager
-    //Local intialization. Once its business is done, there is no need to keep it around
-    WiFiManager wifiManager(192);
-    //set timeout 180 sec.
-    wifiManager.setTimeout(180);
-    //reset settings - for testing
-    //wifiManager.resetSettings();
-  
-    //set callback that gets called when connecting to previous WiFi fails, and enters Access Point mode
-    wifiManager.setAPCallback(configModeCallback);
-  
-    //fetches ssid and pass and tries to connect
-    //if it does not connect it starts an access point with the specified name
-    //here  "AutoConnectAP"
-    //and goes into a blocking loop awaiting configuration
-    if (!wifiManager.autoConnect()) {
-      Serial.println("failed to connect and hit timeout");
-      //reset and try again, or maybe put it to deep sleep
-      //ESP.reset();
-      delay(1000);
-    }
-
-    //if you get here you have connected to the WiFi
-    Serial.println("connected...yeey :)");
-    ticker.detach();
-    //keep LED on
-    digitalWrite(BUILTIN_LED, LOW);
-  
-}
-
-void setup() {
-    /* Add Event listeners */
-
-    /* Call onMsghandler() when new message arraives */
-    microgear.on(MESSAGE,onMsghandler);
-
-    /* Call onFoundgear() when new gear appear */
-    microgear.on(PRESENT,onFoundgear);
-
-    /* Call onLostgear() when some gear goes offline */
-    microgear.on(ABSENT,onLostgear);
-
-    /* Call onConnected() when NETPIE connection is established */
-    microgear.on(CONNECTED,onConnected);
-
-    Serial.begin(115200);
-    Serial.println("Starting...");
-
-    //set led pin as output
-    pinMode(BUILTIN_LED, OUTPUT);
-    // start ticker with 0.5 because we start in AP mode and try to connect
-    ticker.attach(0.7, tick);
-
-    initWiFi();
-  
-    /* Initial with KEY, SECRET and also set the ALIAS here */
-    microgear.init(KEY,SECRET,ALIAS);
-
-    /* connect to NETPIE to a specific APPID */
-    microgear.connect(APPID);
-}
-
-void loop() {
-  if(WiFi.status()!=WL_CONNECTED){
-      Serial.println("disconnect wifi.");
-      initWiFi();
-  }else{
-      /* To check if the microgear is still connected */
-      if (microgear.connected()) {
-          Serial.println("connected");
-  
-          /* Call this method regularly otherwise the connection may be lost */
-          microgear.loop();
-  
-          if (timer >= 1000) {
-              Serial.println("Publish...");
-  
-              /* Chat with the microgear named ALIAS which is myself */
-              microgear.chat(ALIAS,"Hello");
-              timer = 0;
-          } 
-          else timer += 100;
-      }
-      else {
-          Serial.println("connection lost, reconnect...");
-          if (timer >= 5000) {
-              microgear.connect(APPID);
-              timeoutConnection++;
-              timer = 0;
-          }
-          else timer += 100;
-
-          if(timeoutConnection==6){
-            if(WiFi.status()==WL_CONNECTED){
-              WiFi.disconnect();
-            }
-            initWiFi();
-          }
-          ticker.detach();
-      }
-  }
-  delay(100);
-}