diff --git a/CSS/codemirror.css.gz b/CSS/codemirror.css.gz
new file mode 100644
index 0000000..83aa54b
Binary files /dev/null and b/CSS/codemirror.css.gz differ
diff --git a/CSS/codemirror.js.gz b/CSS/codemirror.js.gz
new file mode 100644
index 0000000..a7deb05
Binary files /dev/null and b/CSS/codemirror.js.gz differ
diff --git a/CSS/widgets.js.gz b/CSS/widgets.js.gz
new file mode 100644
index 0000000..643a8b8
Binary files /dev/null and b/CSS/widgets.js.gz differ
diff --git a/ESP8266Basic/BasicArray.ino b/ESP8266Basic/BasicArray.ino
index dd8c552..567cf5c 100644
--- a/ESP8266Basic/BasicArray.ino
+++ b/ESP8266Basic/BasicArray.ino
@@ -39,7 +39,7 @@ class basicArray
       }
       else
       {
-        PrintAndWebOut(F("DIM() : format not valid"));
+         SendErrorMsg(F("DIM() : format not valid"));
       }
   } 
 
@@ -55,7 +55,7 @@ class basicArray
   {
     if (ptr.base == NULL) return 0;
     if (index > nbElements)
-      {  PrintAndWebOut(String(SUBSCR_OUT));  return 0; } 
+      {   SendErrorMsg(String(SUBSCR_OUT));  return 0; } 
     return ptr.flo[index];
   }
 
@@ -63,7 +63,7 @@ class basicArray
   {
     if (ptr.base == NULL) return "";
     if (index > nbElements)
-      {  PrintAndWebOut(String(SUBSCR_OUT));  return ""; } 
+      {   SendErrorMsg(String(SUBSCR_OUT));  return ""; } 
     if ( (Format == PARSER_STRING) && (ptr.str[index] != NULL) )
        return *ptr.str[index];
     else
@@ -73,14 +73,14 @@ class basicArray
   void setFloat(int index, float val)
   {
     if (index > nbElements)
-      {  PrintAndWebOut(String(SUBSCR_OUT));  return; } 
+      {   SendErrorMsg(String(SUBSCR_OUT));  return; } 
     ptr.flo[index] = val;
   }    
 
   void setString(int index, String val)
   {
     if (index > nbElements)
-      {  PrintAndWebOut(String(SUBSCR_OUT));  return; } 
+      {   SendErrorMsg(String(SUBSCR_OUT));  return; } 
     if (ptr.str[index] == NULL)
       ptr.str[index] = new String(val);
     else
diff --git a/ESP8266Basic/Classes.h b/ESP8266Basic/Classes.h
index 024f543..df3a1a8 100644
--- a/ESP8266Basic/Classes.h
+++ b/ESP8266Basic/Classes.h
@@ -383,7 +383,7 @@ class FORNEXT
       return -1;  // next without for error
     }
     f = VarialbeLookup(String(stack[_ptr]._var)).toFloat() + stack[_ptr]._step;
-    SetMeThatVar(String(stack[_ptr]._var), FloatToString(f), PARSER_TRUE);
+
 
     // here we must take care of the step direction
     // if positive or negative, the comparison is different
@@ -404,10 +404,12 @@ class FORNEXT
     {
       // the loop is over
       _ptr--;
+	  //SetMeThatVar(String(stack[_ptr]._var), FloatToString(f), PARSER_TRUE);
       return 0;
     }
     else
     {
+	  SetMeThatVar(String(stack[_ptr]._var), FloatToString(f), PARSER_TRUE);
       return stack[_ptr]._pos;
     }
   }
diff --git a/ESP8266Basic/Commands.ino b/ESP8266Basic/Commands.ino
index c7591a5..395fcf1 100644
--- a/ESP8266Basic/Commands.ino
+++ b/ESP8266Basic/Commands.ino
@@ -2,6 +2,9 @@ parser_data pd;
 int num_args;
 PARSER_PREC args[PARSER_MAX_ARGUMENT_COUNT];
 String *args_str[PARSER_MAX_ARGUMENT_COUNT];
+extern String args_var[PARSER_MAX_ARGUMENT_COUNT];
+extern int args_var_pos;
+extern int args_var_level;
 
 void InitCommandParser()
 {
@@ -22,9 +25,13 @@ int ExtractArguments(String &inData)
   pd.str = inData.c_str();
   pd.len = inData.length() + 1; // important the +1 as this permit to touch the '\0'
   pd.error = NULL; // reset the previous error
+  args_var_pos = args_var_pos = 0;
+  for (int i = 0; i < PARSER_MAX_ARGUMENT_COUNT; i++)
+    args_var[i] = "";
   r = parser_read_argument_list( &pd, &num_args, args, args_str);
   if (pd.error != NULL)
-    PrintAndWebOut(String(pd.error));
+    SendErrorMsg(String(pd.error));
+
   return r;
 }
 
@@ -40,6 +47,9 @@ void clear_stacks()
   return_Stack.clear(); // clear the return stack
   forNextStack.clear(); // clear the for next stack
   doLoopStack.clear(); // clear the do loop stack
+  #if defined(BASIC_TFT)
+  form1.clear();
+  #endif
 }
 
 void HaltBasic(String err_mess)
@@ -48,52 +58,76 @@ void HaltBasic(String err_mess)
   RunningProgram = 0;
   WaitForTheInterpertersResponse = 1;
   TimerWaitTime = 0;
-  PrintAndWebOut(err_mess);
-  PrintAndWebOut(String(F("Halted at line ")) + String(RunningProgramCurrentLine));
+  TimerCBtime = 0;
+  SendErrorMsg(err_mess);
+  SendErrorMsg(F("Halted "));
 }
 
 void ExicuteTheCurrentLine()
 {
+	
   int r;
-
+  //Serial.println(RunningProgramCurrentLine);
   String Param0;
+  inData.trim();
+//  inData += "   ";
   String Param1;
   String Param2;
   String Param3;
   String Param4;
   String Param5;
-  inData.trim();
+//  inData.trim();
   Param0 = getValue(inData, ' ', 0);
-  Param1 = getValue(inData, ' ', 1);
-  Param2 = getValue(inData, ' ', 2);
-  Param3 = getValue(inData, ' ', 3);
-  Param4 = getValue(inData, ' ', 4);
-  Param5 = getValue(inData, ' ', 5);
+
+
 
   Param0.toLowerCase();
 
+  
+  
+  if (inData.substring(0, 3) == F("let"))
+  {
+	inData = inData.substring(4);
+	inData.trim();
+	Param0 = getValue(inData, ' ', 0);
+  }
+  
+  
+  
   // Line_For_Eval = inData; /////////////////////////////////////////////////////////////////////////////////////////////////
+  String Params[10]; // max 10 parameters are allowed
 
-  //  int valParam0 = Param0.toInt();
+  int valParam0 = Param0.toInt();
   int valParam1 = Param1.toInt();
   int valParam2 = Param2.toInt();
 
 
   if (BasicDebuggingOn == 1)
   {
-    Serial.println(F("Executing line Debug Statement"));
-    Serial.println(String(String(RunningProgramCurrentLine) + " " + inData));
-    Serial.println(Param0);
-    Serial.println(Param1);
-    Serial.println(Param2);
-    Serial.println(Param3);
-    Serial.println(Param4);
-    Serial.println(Param5);
+	WebSocketSend( "code~^`" + String(RunningProgramCurrentLine));
+	delaytime  = debugDelaySpeed + millis();
   }
 
   Param0.trim();
   if ( Param0 == "") return;
   if (Param0.startsWith("["))  return;
+  if (Param0.startsWith("'"))  return;
+
+  r = parserotto(inData.substring(String(inData + F(" ")).indexOf(' ') + 1), Params);
+  if (r != -1)
+  {
+	delay(0);
+	if (r >= 1) Param1 = Params[0];else Param1 = "";
+	if (r >= 2) Param2 = Params[1];else Param2 = "";
+	if (r >= 3) Param3 = Params[2];else Param3 = "";
+	if (r >= 4) Param4 = Params[3];else Param4 = "";
+	if (r >= 5) Param5 = Params[4];else Param5 = "";
+  }
+
+  
+  
+  
+
 
   if ( Param0 == F("if"))
   {
@@ -104,18 +138,20 @@ void ExicuteTheCurrentLine()
     // we can just define that these words should be surrounded by spaces (" then " " else ")
     //
     int then_pos, else_pos;
+	String TempInData = inData;
+	TempInData.toLowerCase();
 
-    then_pos = inData.indexOf(F(" then "));
-    else_pos = inData.indexOf(F(" else "));
+    then_pos = TempInData.indexOf(F(" then "));
+    else_pos = TempInData.indexOf(F(" else "));
 
-    if (inData.endsWith(F(" then")))
+    if (TempInData.endsWith(F(" then")))
     {
       // this is considered as a IF THEN {ELSE} ENDIF | END IF
 
       String Comparaison = inData.substring(2, inData.length() - 5);  // from the 'if' and 'then' (length - 5 chars ' then')
       Comparaison.trim();
       //Serial.println(Comparaison);
-  
+
       if (evaluate(Comparaison) != "-1") // if expression is false goto else or, if not defined, to endif
       {
         else_pos = IfBlockList.getElse(RunningProgramCurrentLine);
@@ -128,17 +164,17 @@ void ExicuteTheCurrentLine()
         return;
       }
       else    // if the expression is true, continue
-        return;  
+        return;
     }
-    
+
     // works as before when the command is style : if a = b then print a else print d
-    
+
     if (then_pos == -1) // the "then " is not found
     {
       HaltBasic(F("Syntax error in if command"));
       return;
     }
-    
+
     String Comparaison = inData.substring(2, then_pos);
     Comparaison.trim();
     //Serial.println(Comparaison);
@@ -151,14 +187,19 @@ void ExicuteTheCurrentLine()
       return; // there is no else command
 
     inData.trim();
-    //Serial.println(inData);
-    //Param0 = inData.substring(0, inData.indexOf(' '));    // recover the new command
+
     Param0 = getValue(inData, ' ', 0);// recover the new command
-    Param1 = getValue(inData, ' ', 1);
-    Param2 = getValue(inData, ' ', 2);
-    Param3 = getValue(inData, ' ', 3);
-    Param4 = getValue(inData, ' ', 4);
-    Param5 = getValue(inData, ' ', 5);
+	  r = parserotto(inData.substring(String(inData + F(" ")).indexOf(' ') + 1), Params);
+	  if (r != -1)
+	  {
+		delay(0);
+		if (r >= 1) Param1 = Params[0];else Param1 = "";
+		if (r >= 2) Param2 = Params[1];else Param2 = "";
+		if (r >= 3) Param3 = Params[2];else Param3 = "";
+		if (r >= 4) Param4 = Params[3];else Param4 = "";
+		if (r >= 5) Param5 = Params[4];else Param5 = "";
+		
+	  }
 
     Param0.toLowerCase();
   }
@@ -180,37 +221,37 @@ void ExicuteTheCurrentLine()
     // no action
     return;
   }
-  
+
   if (Param0 == F("for"))
   {
     if (forNextStack.setFor(inData, RunningProgramCurrentLine) == false)
       HaltBasic(F("Syntax error in For "));
 
     return;
-    
+
   }
 
 
 
   if (Param0 == F("next"))
   {
-     r = forNextStack.checkNext(inData);
-     if ( r > 0 )
-     {
-        RunningProgramCurrentLine = r;
-        return;
-     }
+    r = forNextStack.checkNext(inData);
+    if ( r > 0 )
+    {
+      RunningProgramCurrentLine = r;
+      return;
+    }
 
-     if (r == 0)
-     {
-       return;
-     }
+    if (r == 0)
+    {
+      return;
+    }
+
+    if ( r == -1)
+    {
+      HaltBasic(F("Next without for "));
+    }
 
-     if ( r == -1)
-     {
-       HaltBasic(F("Next without for "));
-     }
-     
   }
 
 
@@ -222,33 +263,40 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("loop"))
   {
-     r = doLoopStack.checkLoop(inData);
-     if ( r > 0 )
-     {
-        RunningProgramCurrentLine = r;
-        return;
-     }
+    r = doLoopStack.checkLoop(inData);
+    if ( r > 0 )
+    {
+      RunningProgramCurrentLine = r;
+      return;
+    }
 
-     if (r == 0)
-     {
-       return;
-     }
+    if (r == 0)
+    {
+      return;
+    }
 
-     if ( r == -1)
-     {
-       HaltBasic(F("loop without do "));
-       return;
-     }
+    if ( r == -1)
+    {
+      HaltBasic(F("loop without do "));
+      return;
+    }
+
+    if ( r == -2)
+    {
+      HaltBasic(F("loop {until | while} not valid "));
+      return;
+    }
 
-     if ( r == -2)
-     {
-       HaltBasic(F("loop {until | while} not valid "));
-       return;
-     }
 
-    
   }
+   
+   //Serial.println(String(r) + ",Param0=" + Param0 + ",Param1=" + Param1 + ",Param2=" + Param2 + ",Param3=" + Param3 + ",Param4=" + Param4 + ",Param5=" + Param5);
 
+  if (Param0 == F("debugbreak"))
+  {
+    if  (BasicDebuggingOn == 1)RunningProgram = 0;
+    return;
+  }
   
   if (Param0 == F("debugon"))
   {
@@ -262,6 +310,18 @@ void ExicuteTheCurrentLine()
     return;
   }
 
+  if (Param0 == F("guioff"))
+  {
+    WebGuiOff = 2;
+    return;
+  }
+
+  if (Param0 == F("guion"))
+  {
+    WebGuiOff = 0;
+    return;
+  }
+  
 
   if (Param0 == F("run"))
   {
@@ -300,36 +360,14 @@ void ExicuteTheCurrentLine()
 
 
 
-  if (Param0 == F("list"))
-  {
-    for (int i = 0; i <= TotalNumberOfLines; i++)
-    {
-      if (BasicProgram(i).length() > 0)
-      {
-        delay(0);
-        //PrintAndWebOut(BasicProgram[i].length());
-        PrintAndWebOut(String(String(i) + " " + BasicProgram(i)));
-      }
-    }
-    return;
-  }
 
 
-  if (Param0 == F("dir"))
-  {
-    //SPIFFS.begin();
-    Dir dir = SPIFFS.openDir(String("/" ));
-    while (dir.next()) {
-      File f = dir.openFile("r");
-      PrintAndWebOut(String(dir.fileName() + "       " + f.size()));
-    }
-    return;
-  }
+
 
   if (Param0 == F("del"))
   {
     //SPIFFS.begin();
-
+    Param1 = evaluate(Param1);
     PrintAndWebOut(String("/" + Param1));
     PrintAndWebOut(String(SPIFFS.remove(String("/" + Param1))));
     return;
@@ -341,45 +379,15 @@ void ExicuteTheCurrentLine()
 
   //Commnads to controll pins
 
-  if ( Param0 == F("pi"))
-  {
-
-    SetMeThatVar(Param2, String(UniversalPinIO("pi", GetMeThatVar(Param1), 0)), PARSER_TRUE);
-    return;
-  }
-
 
   if ( Param0 == F("interrupt"))
   {
-    UniversalPinIO(GetMeThatVar(Param2), GetMeThatVar(Param1), 0);
-    return;
-  }
-
-
-  if ( Param0 == F("po"))
-  {
-
-    valParam2 = VarialbeLookup(Param2).toInt();
-
-    UniversalPinIO("po", VarialbeLookup(Param1), valParam2);
+    UniversalPinIO(Param2, evaluate(Param1), 0);
     return;
   }
 
 
-  if ( Param0 == F("pwi"))
-  {
-    SetMeThatVar(Param2, String(UniversalPinIO("pwi", VarialbeLookup(Param1), 0)), PARSER_TRUE);
-    return;
-  }
 
-  if ( Param0 == F("pwo"))
-  {
-
-    valParam2 = VarialbeLookup(Param2).toInt();
-
-    UniversalPinIO("pwo", VarialbeLookup(Param1), valParam2);
-    return;
-  }
 
   if ( Param0 == F("pwmfreq"))
   {
@@ -391,80 +399,49 @@ void ExicuteTheCurrentLine()
     return;
   }
 
-  if ( Param0 == "temp" | Param0 == "ti")
-  {
-    valParam1 = GetMeThatVar(Param1).toInt();
-    // call sensors.requestTemperatures() to issue a global temperature
-    // request to all devices on the bus
-    sensors.requestTemperatures(); // Send the command to get temperatures
-
-    SetMeThatVar(Param2, String(sensors.getTempCByIndex(valParam1)), PARSER_TRUE);
-    return;
-  }
 
 
-  if ( Param0 == F("ai"))
-  {
-    SetMeThatVar(Param1, String(analogRead(A0)), PARSER_TRUE);
-    return;
-  }
 
-  if ( Param0 == F("servo"))
-  {
-    valParam2 = evaluate(Param2).toInt();
-    delay(0);
-    UniversalPinIO(F("servo"), evaluate(Param1), valParam2);
-    return;
-  }
 
 
 
+  //time and delay stuff
 
-  //Feading and writing variables to flash memory
-  if ( Param0 == F("read"))
+  if ( Param0 == F("delay"))
   {
-    SetMeThatVar(Param2, LoadDataFromFile(GetMeThatVar(Param1)), PARSER_STRING);
+    // this is an example of extraction using the ExtractArgument function just for one parameter
+    // the best way, with a single parameter, is to use directly the eval command
+	delaytime = evaluate(Param1).toInt() + millis();
     return;
   }
 
-
-  if ( Param0 == F("write"))
+  if ( Param0 == F("timer"))
   {
-    SaveDataToFile(GetMeThatVar(Param1), VarialbeLookup(Param2));
+
+    TimerWaitTime = evaluate(Param1).toInt();
+    TimerBranch = Param2;
+	timerLastActiveTime = millis() ;
     return;
   }
-
-  if ( Param0 == F("delay"))
-  {
-    // this is an example of extraction using the ExtractArgument function just for one parameter
-    // the best way, with a single parameter, is to use directly the eval command
-    r = ExtractArguments(inData);
-    //valParam1 = GetMeThatVar(Param1).toInt();
-    delay(args[0]);
-    DeAllocateArguments();  // don't forget to call this function after each ExtractArguments
+  if ( Param0 == F("mqttbranch"))
+  { 
+	MQTTBranch = Param1;
     return;
   }
-
-  if ( Param0 == F("timer"))
+  if ( Param0 == F("timercb"))
   {
-    // this is another way to separate the arguments
-    // we can state that the label name is separated from the 1st argument by a ',';
-    // we can so find the ',' from the end of the string and take the argument space trimmed for the label name
-    // the 1st argument will be so the text between this ',' and the end of the command
-    Param1 = inData.substring(inData.indexOf(' ') + 1);    // starts just after the command
-    r = Param1.lastIndexOf(',');
-    if (r == -1)
+    TimerCBtime = 0;
+    int i;
+	TimerCBtime = evaluate(Param1).toInt();
+	if (TimerCBtime == 0) return;
+    if ((i = JumpList.getPos(Param2)) != -1)
     {
-      PrintAndWebOut(F("Syntax Error; Label or argument missing"));
+      TimerCBBranchLine = i - 1;
+	  timercbLastActiveTime = millis();
+      
       return;
     }
-    Param2 = Param1.substring(r + 1);
-    Param2.trim();
-    Param1 = Param1.substring(0, r);
-    TimerWaitTime = evaluate(Param1).toInt();
-    TimerBranch = Param2;
-    //TimerWaitTime = GetMeThatVar(Param1).toInt();
-    //TimerBranch = Param2;
+    SendErrorMsg(F("timercb line not found!"));
     return;
   }
 
@@ -480,10 +457,8 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("print"))
   {
-    // this is an example of extraction using directly the evaluate function taking into account all the text after the command (so after the ' ' )
-    Param1 = inData.substring(Param0.length() + 1);    // starts just after the command
-    //PrintAndWebOut(GetMeThatVar(Param1));
-    PrintAndWebOut(evaluate(Param1));
+    Param1 = evaluate(Param1);
+    PrintAndWebOut(Param1);
     return;
   }
 
@@ -504,11 +479,30 @@ void ExicuteTheCurrentLine()
     return;
   }
 
+  if (Param0 == F("websockprint"))
+  {
+    //Serial.println(GetMeThatVar(Param1));
+    Param1 = inData.substring(Param0.length() + 1);    // starts just after the command
+    WebSocketSend(  evaluate(Param1).c_str());
+    return;
+  }
+
+  if (Param0 == F("webobj"))   // change the property of an object in the webpage
+  {
+    //Serial.println(GetMeThatVar(Param1));
+    Param1 = inData.substring(Param0.length() + 1);    // starts just after the command
+    WebSocketSend(  evaluate(Param1).c_str());
+    return;
+  }
+
   if (Param0 == F("serial2begin"))  // new command serial2begin baudrate, pin TX, pin RX
   {
     r = ExtractArguments(inData);
     if (args[0] <= 0)
-      {  PrintAndWebOut(F("Serial2Begin: baudrate must be > 0"));  return; }
+    {
+      SendErrorMsg(F("Serial2Begin: baudrate must be > 0"));
+      return;
+    }
     delete swSer; // close eventually the previous instance of the sw serial port
     switch (num_args)
     {
@@ -516,7 +510,7 @@ void ExicuteTheCurrentLine()
         swSer = new SoftwareSerial(12, 2, false, 256);  // pin 12 RX, pin 2 TX, no inverse logic, 256 bytes buffer
         swSer->begin(args[0]);
         break;
-        
+
       case 2:
         swSer = new SoftwareSerial(12, args[1], false, 256);  // pin 12 RX, pin x TX, no inverse logic, 256 bytes buffer
         swSer->begin(args[0]);
@@ -525,11 +519,11 @@ void ExicuteTheCurrentLine()
       case 3:
         swSer = new SoftwareSerial(args[2], args[1], false, 256);  // pin y RX, pin x TX, no inverse logic, 256 bytes buffer
         swSer->begin(args[0]);
-        break;        
+        break;
     }
     return;
   }
-  
+
   if (Param0 == F("serial2end"))
   {
     delete swSer;
@@ -564,11 +558,11 @@ void ExicuteTheCurrentLine()
 
 
 
-
+ #if defined(BASIC_TFT)
   //i2c led display
   if (Param0 == "oledprint")
   {
-    Param1 = GetMeThatVar(Param1);
+    Param1 = evaluate(Param1);
 
     int str_len = Param1.length() + 1;
     char OLEDTString[str_len];
@@ -588,7 +582,7 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == "oledsend")
   {
-    sendcommand(GetMeThatVar(Param1).toInt());
+    sendcommand(evaluate(Param1).toInt());
     return;
   }
 
@@ -601,12 +595,12 @@ void ExicuteTheCurrentLine()
   //i2c 1602 lcd display
   if (Param0 == "lcdprint")
   {
-    Param1 = GetMeThatVar(Param1);
+    Param1 = evaluate(Param1);
 
     int str_len = Param1.length() + 1;
     char LCDTString[str_len];
     Param1.toCharArray(LCDTString, str_len);
-    lcd.setCursor(GetMeThatVar(Param2).toInt(), GetMeThatVar(Param3).toInt());
+    lcd.setCursor(evaluate(Param2).toInt(), evaluate(Param3).toInt());
     lcd.print(LCDTString);
     return;
   }
@@ -635,12 +629,12 @@ void ExicuteTheCurrentLine()
   {
     //Param1 is the value to send
     //Param2 is MODE: 0=COMMAND, 1=DATA, 2=FOUR_BITS
-    lcd.send(GetMeThatVar(Param1).toInt(), GetMeThatVar(Param2).toInt());
+    lcd.send(evaluate(Param1).toInt(), evaluate(Param2).toInt());
     return;
   }
 
   //end i2c 1602 lcd display code
-
+ #endif
 
 
 
@@ -648,10 +642,8 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("wprint") | Param0 == F("html"))
   {
-    Param1 = inData.substring(Param0.length() + 1);    // starts just after the command
     Param1 = evaluate(Param1);
-    HTMLout += Param1;
-    //Serial.print(HTMLout);
+    AddToWebOut(Param1);
     return;
   }
 
@@ -659,9 +651,10 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("image"))
   {
+
     String tempInfo = GenerateIDtag(normalImage);
-    tempInfo.replace(F("name"), GetMeThatVar(Param1));
-    HTMLout += tempInfo;
+    tempInfo.replace(F("name"), evaluate(Param1));
+    AddToWebOut(tempInfo);
     //Serial.print(HTMLout);
     return;
   }
@@ -669,18 +662,29 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("javascript"))
   {
+    NewGuiItemAddedSinceLastWait = 1;
     String tempInfo = javascript;
-    tempInfo.replace(F("name"), GetMeThatVar(Param1));
+    tempInfo.replace(F("name"), evaluate(Param1));
     HTMLout += tempInfo;
     //Serial.print(HTMLout);
     return;
   }
+  
+  if (Param0 == F("jscall"))
+  {
+	WebSocketSend("call~^`" + evaluate(Param1));
+    //Serial.print(HTMLout);
+    return;
+  }
+  
+
 
 
   if (Param0 == F("css"))
   {
+    NewGuiItemAddedSinceLastWait = 1;
     String tempInfo = CSSscript;
-    tempInfo.replace(F("name"), GetMeThatVar(Param1));
+    tempInfo.replace(F("name"), evaluate(Param1));
     HTMLout += tempInfo;
     //Serial.print(HTMLout);
     return;
@@ -700,14 +704,14 @@ void ExicuteTheCurrentLine()
 
     tempTextBox.replace(F("variablevalue"),  String(F("VARS|")) + String(LastVarNumberLookedUp));
     tempTextBox.replace(F("variablenumber"),  String(LastVarNumberLookedUp));
-
-    HTMLout = String(HTMLout + tempTextBox);
+    AddToWebOut(tempTextBox);
     return;
   }
 
 
   if (Param0 == F("passwordbox"))
   {
+
     String tempTextBox = GenerateIDtag(passwordbox);
     VarialbeLookup(Param1);
     if (VariableLocated == 0)
@@ -718,8 +722,8 @@ void ExicuteTheCurrentLine()
 
     tempTextBox.replace(F("variablevalue"),  String(F("VARS|")) + String(LastVarNumberLookedUp));
     tempTextBox.replace(F("variablenumber"),  String(LastVarNumberLookedUp));
+    AddToWebOut(tempTextBox);
 
-    HTMLout = String(HTMLout + tempTextBox);
     return;
   }
 
@@ -727,60 +731,113 @@ void ExicuteTheCurrentLine()
   if (Param0 == F("slider"))
   {
     String tempSlider = GenerateIDtag(Slider);
-    VarialbeLookup(Param1);
+    VarialbeLookup(args_var[0]);
+	
+	VarialbeLookup(Param1);
     if (VariableLocated == 0)
     {
-      SetMeThatVar(Param1, "", PARSER_TRUE);
+      SetMeThatVar(Param1, "0", PARSER_TRUE);
       GetMeThatVar(Param1);
     }
     tempSlider.replace(F("variablevalue"),  String(F("VARS|")) + String(LastVarNumberLookedUp));
     tempSlider.replace(F("variablenumber"),  String(LastVarNumberLookedUp));
 
-    tempSlider.replace(F("minval"),  GetMeThatVar(Param2));
-    tempSlider.replace(F("maxval"),  GetMeThatVar(Param3));
+    tempSlider.replace(F("minval"), evaluate(Param2));
+    tempSlider.replace(F("maxval"), evaluate(Param3));
+
+    AddToWebOut( tempSlider);
+
+    return;
+  }
+
+  if (Param0 == F("meter"))
+  {
+    String tempMeter = GenerateIDtag(meter);
+
+	VarialbeLookup(Param1);
+    if (VariableLocated == 0)
+    {
+      SetMeThatVar(Param1, "0", PARSER_TRUE);
+      GetMeThatVar(Param1);
+    }
+    tempMeter.replace(F("variablevalue"),  String(F("VARS|")) + String(LastVarNumberLookedUp));
+    tempMeter.replace(F("variablenumber"),  String(LastVarNumberLookedUp));
+
+    tempMeter.replace(F("minval"), evaluate(Param2));
+    tempMeter.replace(F("maxval"), evaluate(Param3));
 
-    HTMLout = String(HTMLout + tempSlider);
+    AddToWebOut(tempMeter);
     return;
   }
 
+  if (Param0 == F("cssid"))
+  {
+	Param1 = evaluate(Param1);
+    String tempCSSid = CSSid;
+    tempCSSid.replace(F("myid"),  Param1);
+	Param2 = evaluate(Param2);
+    tempCSSid.replace(F("*style*"),  Param2);
+    
+	AddToWebOut(tempCSSid);
 
+    return;
+  }
 
+  if (Param0 == F("cssclass"))
+  {
+	Param1 = evaluate(Param1);
+    String tempCSSclass = CSSclass;
+    tempCSSclass.replace(F("myid"),  Param1);
+	Param2 = evaluate(Param2);
+    tempCSSclass.replace(F("*style*"),  Param2);
+
+    AddToWebOut(tempCSSclass);
+    return;
+  }
+  
 
   if (Param0 == F("dropdown") | Param0 == F("listbox"))
   {
+    r = ExtractArguments(inData);
     String tempDropDownList = GenerateIDtag(DropDownList);
     String tempDropDownListOpptions  = DropDownListOpptions;
     String TempItems;
     String TempBla;
 
-    Param1 = GetMeThatVar(Param1);
+
+    Param3 = String(args[2]);
+
 
     for (int i = 0; i <= 20; i++)
     {
       tempDropDownListOpptions  = DropDownListOpptions;
-      TempBla = getValue(String(Param1 + ","), ',', i);
+      TempBla = getValue(String(*args_str[1] + ","), ',', i);
       TempBla.replace(",", "");
-      if (TempBla != "") {
-
+      if (TempBla != "")
+      {
         tempDropDownListOpptions.replace(F("item"),  TempBla);
         TempItems = String( TempItems + tempDropDownListOpptions);
       }
       delay(0);
     }
 
-    Param2 = GetMeThatVar(Param2);
+	
+	VarialbeLookup(Param1);
     if (VariableLocated == 0)
     {
-      SetMeThatVar(Param2, "", PARSER_STRING);
-      GetMeThatVar(Param2);
+      SetMeThatVar(Param1, "", PARSER_STRING);
+      GetMeThatVar(Param1);
     }
+	
 
+	
     tempDropDownList.replace(F("variablenumber"),  String(LastVarNumberLookedUp));
     tempDropDownList.replace(F("options"),  TempItems);
     if (Param3.toInt() < 1 | Param0 == F("dropdown")) Param3 = "1";
     tempDropDownList.replace(F("theSize"), String(Param3.toInt()));
 
-    HTMLout = String(HTMLout + tempDropDownList);
+    AddToWebOut(tempDropDownList);
+    DeAllocateArguments();
     return;
   }
 
@@ -790,18 +847,33 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("button"))
   {
-    //Serial.println(Param1);
-    //Serial.println(Param2);
-    numberButtonInUse++;
-    String tempButton = GenerateIDtag(GOTObutton);
-    tempButton.replace(F("gotonotext"),  GetMeThatVar(Param1));
-    //Serial.println(String(String(numberButtonInUse) + " = numberButtonInUse"));
+    //r = ExtractArguments(inData);
+    r = parserotto(inData.substring(inData.indexOf(' ') + 1), Params);
 
-    tempButton.replace(F("gotonobranch"),  String(F("goto")) + String(numberButtonInUse));
+    if (r == -1) {
+      HaltBasic(F("Syntax Error!"));
+      return;
+    }
+    if (r != 2) {
+      HaltBasic(F("The arguments must be 2!"));
+      return;
+    }
+    String tempButton = GenerateIDtag(GOTObutton);
+    tempButton.replace(F("gotonotext"),  evaluate(Params[0]));
+	
+	
+    tempButton.replace(F("gotonobranch"),  String(JumpList.getPos(Params[1])));
 
-    ButtonsInUse[numberButtonInUse] = Param2;
+    //ButtonsInUse[numberButtonInUse] = Params[1];
     //Serial.println(ButtonsInUse[numberButtonInUse]);
-    HTMLout = String(HTMLout + tempButton);
+    AddToWebOut(tempButton);
+    if ((r = JumpList.getPos(Param2)) != -1)
+    {
+
+      return;
+    }
+    SendErrorMsg(String(F("Button goto Label not found:")) + Param2);
+
     return;
   }
 
@@ -810,18 +882,22 @@ void ExicuteTheCurrentLine()
   if (Param0 == F("imagebutton"))
   {
     numberButtonInUse++;
+	Param1 = evaluate(Param1);
     String tempButton = GenerateIDtag(GOTOimagebutton);
+    if (Param1.startsWith(F("http://")) | Param1.startsWith(F("HTTP://")) )tempButton.replace(F("/file?file="), "");
+    tempButton.replace(F("gotonotext"),  Param1);
 
-    if (GetMeThatVar(Param1).startsWith(F("http://")) | GetMeThatVar(Param1).startsWith(F("HTTP://")) )tempButton.replace(F("/file?file="), "");
-
-    tempButton.replace(F("gotonotext"),  GetMeThatVar(Param1));
+    tempButton.replace(F("gotonobranch"),  String(JumpList.getPos(Param2)));
 
-    tempButton.replace(F("gotonobranch"),  String(F("goto")) + String(numberButtonInUse));
-
-    ButtonsInUse[numberButtonInUse] = Param2;
-    //Serial.println(ButtonsInUse[numberButtonInUse]);
-    HTMLout = String(HTMLout + tempButton);
+    AddToWebOut(tempButton);
+    if ((r = JumpList.getPos(Param2)) != -1)
+    {
+      return;
+    }
+    SendErrorMsg(String(F("Button goto Label not found:")) + Param2);
     return;
+	
+	
   }
 
 
@@ -839,32 +915,30 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("wait"))
   {
-    //HTMLout = String(HTMLout + "<hr>" + GetMeThatVar(Param1));
+	if (NewGuiItemAddedSinceLastWait == 1) 
+	{
+		NewGuiItemAddedSinceLastWait = 0;
+		WebSocketSend(  "guicls");
+	}
     WaitForTheInterpertersResponse = 1;
     return;
   }
 
   if (Param0 == F("returngui"))
   {
+	WebSocketSend(  "guicls");
     //HTMLout = String(HTMLout + "<hr>" + GetMeThatVar(Param1));
     server->send(200, "text/html", RunningProgramGui());
     server->handleClient();
     WaitForTheInterpertersResponse = 0;
     return;
   }
-
-
-
-  
-  //PrintAndWebOut("Just Passed the Wait Command");
-
   if (Param0 == F("cls"))
   {
     numberButtonInUse = 0;
 
-    for (int i = 0; i <= 10; i++) {
-      ButtonsInUse[i] = "";
-    }
+
+    WebSocketSend(  "guicls");
     HTMLout = "";
     return;
   }
@@ -872,90 +946,111 @@ void ExicuteTheCurrentLine()
 
 
   //All of my graphis engeine commands
-
+#if defined(BASIC_TFT)
   if (Param0 == F("graphics"))
   {
-    GraphicsEliments[0][1] = GetMeThatVar(Param1).toInt();
-    GraphicsEliments[0][2] = GetMeThatVar(Param2).toInt();
+	NewGuiItemAddedSinceLastWait = 1;
+    GraphicsEliments[0][1] = evaluate(Param1).toInt();
+    GraphicsEliments[0][2] = evaluate(Param2).toInt();
     HTMLout += F("**graphics**");
     return;
   }
 
   if (Param0 == F("gcls"))
   {
+    NewGraphicItemAddedSinceLastWait = 1;
     GraphicsEliments[0][0] = 0;
     return;
   }
 
   if (Param0 == F("line"))
   {
+    NewGraphicItemAddedSinceLastWait = 1;
     int i;
     GraphicsEliments[0][0] += 1;
     i = GraphicsEliments[0][0];
     GraphicsEliments[i][0] = 1;
-    GraphicsEliments[i][1] = GetMeThatVar(Param1).toInt();
-    GraphicsEliments[i][2] = GetMeThatVar(Param2).toInt();
-    GraphicsEliments[i][3] = GetMeThatVar(Param3).toInt();
-    GraphicsEliments[i][4] = GetMeThatVar(Param4).toInt();
-    GraphicsEliments[i][5] = GetMeThatVar(Param5).toInt();
+    GraphicsEliments[i][1] = evaluate(Param1).toInt();
+    GraphicsEliments[i][2] = evaluate(Param2).toInt();
+    GraphicsEliments[i][3] = evaluate(Param3).toInt();
+    GraphicsEliments[i][4] = evaluate(Param4).toInt();
+    GraphicsEliments[i][5] = evaluate(Param5).toInt();
     return;
   }
 
   if (Param0 == F("circle"))
   {
+    NewGraphicItemAddedSinceLastWait = 1;
     int i;
     GraphicsEliments[0][0] += 1;
     i = GraphicsEliments[0][0];
     GraphicsEliments[i][0] = 2;
-    GraphicsEliments[i][1] = GetMeThatVar(Param1).toInt();
-    GraphicsEliments[i][2] = GetMeThatVar(Param2).toInt();
-    GraphicsEliments[i][3] = GetMeThatVar(Param3).toInt();
-    GraphicsEliments[i][5] = GetMeThatVar(Param4).toInt();
+    GraphicsEliments[i][1] = evaluate(Param1).toInt();
+    GraphicsEliments[i][2] = evaluate(Param2).toInt();
+    GraphicsEliments[i][3] = evaluate(Param3).toInt();
+    GraphicsEliments[i][5] = evaluate(Param4).toInt();
     return;
   }
 
   if (Param0 == F("ellipse"))
   {
+    NewGraphicItemAddedSinceLastWait = 1;
     int i;
     GraphicsEliments[0][0] += 1;
     i = GraphicsEliments[0][0];
     GraphicsEliments[i][0] = 3;
-    GraphicsEliments[i][1] = GetMeThatVar(Param1).toInt();
-    GraphicsEliments[i][2] = GetMeThatVar(Param2).toInt();
-    GraphicsEliments[i][3] = GetMeThatVar(Param3).toInt();
-    GraphicsEliments[i][4] = GetMeThatVar(Param4).toInt();
-    GraphicsEliments[i][5] = GetMeThatVar(Param5).toInt();
+    GraphicsEliments[i][1] = evaluate(Param1).toInt();
+    GraphicsEliments[i][2] = evaluate(Param2).toInt();
+    GraphicsEliments[i][3] = evaluate(Param3).toInt();
+    GraphicsEliments[i][4] = evaluate(Param4).toInt();
+    GraphicsEliments[i][5] = evaluate(Param5).toInt();
     return;
   }
 
   if (Param0 == F("rect"))
   {
+    NewGraphicItemAddedSinceLastWait = 1;
     int i;
     GraphicsEliments[0][0] += 1;
     i = GraphicsEliments[0][0];
     GraphicsEliments[i][0] = 4;
-    GraphicsEliments[i][1] = GetMeThatVar(Param1).toInt();
-    GraphicsEliments[i][2] = GetMeThatVar(Param2).toInt();
-    GraphicsEliments[i][3] = GetMeThatVar(Param3).toInt();
-    GraphicsEliments[i][4] = GetMeThatVar(Param4).toInt();
-    GraphicsEliments[i][5] = GetMeThatVar(Param5).toInt();
+    GraphicsEliments[i][1] = evaluate(Param1).toInt();
+    GraphicsEliments[i][2] = evaluate(Param2).toInt();
+    GraphicsEliments[i][3] = evaluate(Param3).toInt();
+    GraphicsEliments[i][4] = evaluate(Param4).toInt();
+    GraphicsEliments[i][5] = evaluate(Param5).toInt();
     return;
   }
 
-
+  
+  if (Param0 == F("text"))
+  {
+    NewGraphicItemAddedSinceLastWait = 1;
+    int i;
+    GraphicsEliments[0][0] += 1;
+    i = GraphicsEliments[0][0];
+    GraphicsEliments[i][0] = 5;
+    GraphicsEliments[i][1] = evaluate(Param1).toInt();
+    GraphicsEliments[i][2] = evaluate(Param2).toInt();
+    GraphicsEliments[i][3] = evaluate(Param4).toInt();
+    GraphicsText[i] = evaluate(Param3);
+    GraphicsEliments[i][5] = evaluate(Param5).toInt();
+    return;
+  }
+#endif
 
   if (Param0 == F("input"))
   {
+
     if (Param2 == "")
     {
       SetMeThatVar(Param1, getSerialInput(), PARSER_STRING);
     }
     else
     {
-      Serial.print(GetMeThatVar(Param1));
+      Serial.print(evaluate(Param1));
       SetMeThatVar(Param2, getSerialInput(), PARSER_STRING);
     }
-    //PrintAndWebOut("");
     return;
   }
 
@@ -963,7 +1058,6 @@ void ExicuteTheCurrentLine()
   {
     Param2 = "";
     delay(10);
-    //Serial.println("serialinput passage");
     while (Serial.available() > 0)
     {
       char received = Serial.read();
@@ -988,7 +1082,7 @@ void ExicuteTheCurrentLine()
     SetMeThatVar(Param1, Param2, PARSER_STRING);
     return;
   }
-    
+
   if (Param0 == F("serialflush"))
   {
 
@@ -1000,7 +1094,7 @@ void ExicuteTheCurrentLine()
   if (Param0 == F("serialtimeout"))
   {
 
-    SerialTimeOut = GetMeThatVar(Param1).toInt();
+    SerialTimeOut = evaluate(Param1).toInt();
     return;
   }
 
@@ -1008,26 +1102,41 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("goto"))
   {
-    if ((r = JumpList.getPos(Param1)) != -1)
-    {    
-      RunningProgramCurrentLine = r - 1;
-      return;
-    }
-    PrintAndWebOut(String(F("Goto Label not found:")) + Param1);
-    return;
+	  
+	if (!Param1.startsWith(F("[")))
+	{
+		Param1 = evaluate(Param1);
+	}
+	if ((r = JumpList.getPos(Param1)) != -1)
+	{
+	  RunningProgramCurrentLine = r - 1;
+	  return;
+	}
+	SendErrorMsg(String(F("Goto Label not found:")) + Param1);
+	return;
+	
+
   }
 
 
   if (Param0 == F("gosub"))
   {
-    if ((r = JumpList.getPos(Param1)) != -1)
-    {
-        return_Stack.push(RunningProgramCurrentLine);
-        RunningProgramCurrentLine = r - 1;
-        return;
-    }
-    PrintAndWebOut(String(F("Gosub Label not found:")) + Param1);
-    return;
+
+	if (!Param1.startsWith(F("[")))
+	{
+		Param1 = evaluate(Param1);
+	}
+	
+	if ((r = JumpList.getPos(Param1)) != -1)
+	{
+	  return_Stack.push(RunningProgramCurrentLine);
+	  RunningProgramCurrentLine = r - 1;
+	  return;
+	}
+   SendErrorMsg(String(F("Gosub Label not found:")) + Param1);
+	return;
+
+	
   }
 
 
@@ -1044,15 +1153,44 @@ void ExicuteTheCurrentLine()
     SerialBranchLine  = abs(SerialBranchLine);  // restore the serialbranch command
     Serial2BranchLine = abs(Serial2BranchLine); // restore the serial2branch command
     IRBranchLine = abs(IRBranchLine); // restore the IRbranch command
+    TimerCBBranchLine = abs(TimerCBBranchLine); // restore the timercb command
+	
+    #if defined(BASIC_TFT)
+	TouchBranchLine = abs(TouchBranchLine); // restore the TouchBranch command
+	#endif
+    WebSockEventBranchLine = abs(WebSockEventBranchLine); // restore the websockevent command
+    WebSockChangeBranchLine = abs(WebSockChangeBranchLine); // restore the websockchange command
+    webSocket->loop();
     return;
   }
 
   if (Param0 == F("end"))
   {
+	clientTelnet.stop();
     clear_stacks();
+	WebGuiOff = 0;
+	IRBranchLine = 0;
+	#if defined(BASIC_TFT)
+	TouchBranchLine = 0;
+	#endif
+	WebSockEventBranchLine = 0;
+	telnetBranch = 0;
+	
     RunningProgram = 0;
     WaitForTheInterpertersResponse = 1;
     TimerWaitTime = 0;
+    TimerCBtime = 0;
+	
+	MQTTlatestMsg = "";
+	MQTTnewMsgReceived = 0;
+	MQTTActivated = 0;
+	MQTTBranch = "";
+	MQTTSubscribeTopic = "";
+	MQTTPublishTopic = "";
+	MQTTPublishMSG = "";
+	MQTTTimeFromLastCheck = 0;
+	refreshBranch = "";
+	
     PrintAndWebOut(F("Done..."));
     return;
   }
@@ -1060,14 +1198,42 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("load"))
   {
+	
+	Param1 =  evaluate(Param1);
     clear_stacks();
     GraphicsEliments[0][0] = 0;
     PrintAndWebOut(String(F("Loading . . . . ")) + Param1);
     ProgramName = Param1;
+	LoadBasicProgramFromFlash( ProgramName);
     numberButtonInUse = 0;
     RunningProgramCurrentLine = 0;
     HTMLout = "";
-    TimerWaitTime = 0;
+	
+	clientTelnet.stop();
+    clear_stacks();
+	WebGuiOff = 0;
+	IRBranchLine = 0;
+	#if defined(BASIC_TFT)
+	TouchBranchLine = 0;
+	#endif
+	WebSockEventBranchLine = 0;
+	telnetBranch = 0;
+	TimerWaitTime = 0;
+    TimerCBtime = 0;
+	
+	MQTTlatestMsg = "";
+	MQTTnewMsgReceived = 0;
+	MQTTActivated = 0;
+	MQTTBranch = "";
+	MQTTSubscribeTopic = "";
+	MQTTPublishTopic = "";
+	MQTTPublishMSG = "";
+	MQTTTimeFromLastCheck = 0;
+	refreshBranch = "";
+	
+	
+	
+	
     return;
   }
 
@@ -1078,13 +1244,14 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("connect"))
   {
-    ConnectToTheWIFI(GetMeThatVar(Param1), GetMeThatVar(Param2), GetMeThatVar(Param3), GetMeThatVar(Param4), GetMeThatVar(Param5));
+    ConnectToTheWIFI(evaluate(Param1), evaluate(Param2), evaluate(Param3), evaluate(Param4), evaluate(Param5));
     return;
   }
 
   if (Param0 == F("ap"))
   {
-    CreateAP(GetMeThatVar(Param1), GetMeThatVar(Param2));
+    //CreateAP(GetMeThatVar(Param1), GetMeThatVar(Param2));
+    CreateAP(evaluate(Param1), evaluate(Param2), LoadDataFromFile("ipaddress"), LoadDataFromFile("gateway"), LoadDataFromFile("subnetmask"));
     return;
   }
 
@@ -1095,14 +1262,26 @@ void ExicuteTheCurrentLine()
     return;
   }
 
+  
+  if (Param0 == F("wifiapsta"))
+  {
+    //WiFi.disconnect();
+	wifiApStaModeOn = 1;
+    WiFi.mode(WIFI_AP_STA);
+    return;
+  }
+  
+  
+  
+
 
 
   if (Param0 == F("setupemail"))
   {
-    EmailServer = GetMeThatVar(Param1);
-    Emailport = GetMeThatVar(Param2).toInt();
-    EmailSMTPuser = GetMeThatVar(Param3);
-    EmailSMTPpassword = GetMeThatVar(Param4);
+    EmailServer = evaluate(Param1);
+    Emailport = evaluate(Param2).toInt();
+    EmailSMTPuser = evaluate(Param3);
+    EmailSMTPpassword = evaluate(Param4);
     return;
   }
 
@@ -1110,40 +1289,48 @@ void ExicuteTheCurrentLine()
   if (Param0 == F("email") | Param0 == F("sendemail" ))
   {
     //To, From, Subject, MsgBody
-    sendEmail(GetMeThatVar(Param1), GetMeThatVar(Param2), GetMeThatVar(Param3), GetMeThatVar(Param4) );
+    sendEmail(evaluate(Param1), evaluate(Param2), evaluate(Param3), evaluate(Param4) );
     return;
   }
 
 
+  
+  if (Param0 == F("telnetbranch"))
+  {
+	if ((r = JumpList.getPos(Param1)) != -1)
+    {
+      telnetBranch = r - 1;
+	  return;
+    }
+    SendErrorMsg(String(F("TELNETBRANCH Label not found:")) + Param1);
+
+    return;
+  }
+  
+  
 
   //Code to handle MSG Branch
 
 
   if (Param0 == F("msgbranch"))
   {
-    msgbranch = Param1;
+	if ((r = JumpList.getPos(Param1)) != -1)
+    {
+      msgbranch = r - 1;
+	  return;
+    }
+    SendErrorMsg(String(F("MSGBRANCH Label not found:")) + Param1);
+
     return;
   }
 
   if (Param0 == F("msgreturn"))
   {
-    MsgBranchRetrnData = VarialbeLookup(Param1);
+    MsgBranchRetrnData = evaluate(Param1);
     return;
   }
 
 
-  if (Param0 == F("msgget"))
-  {
-    //Serial.println(Param1);
-
-    //Serial.println(Param2);
-    Param1 = GetMeThatVar(Param1);
-    int str_len = Param1.length() + 1;
-    char MgetToTest[str_len];
-    Param1.toCharArray(MgetToTest, str_len);
-    SetMeThatVar(Param2, GetRidOfurlCharacters(server->arg( MgetToTest  )), PARSER_STRING);
-    return;
-  }
 
 
 
@@ -1152,7 +1339,7 @@ void ExicuteTheCurrentLine()
   if (Param0 == F("udpbegin"))  // the command is : udpbegin port
   {
     String ar = inData.substring(Param0.length() + 1);    // starts just after the command
-    int v = evaluate(ar).toInt();        
+    int v = evaluate(ar).toInt();
     udp.begin(v);
 
     return;
@@ -1177,12 +1364,12 @@ void ExicuteTheCurrentLine()
       }
       udp.beginMulticast(WiFi.localIP(), RemoteIP, args[1]);
     }
-     
+
     DeAllocateArguments();
     return;
   }
 
-  
+
   if (Param0 == F("udpwrite"))  // the command is : udpwrite ip_address, port, message
   {
     r = ExtractArguments(inData);
@@ -1235,18 +1422,18 @@ void ExicuteTheCurrentLine()
   if (Param0 == F("udpreply"))  // the command is : udpreply message
   {
     String ar = inData.substring(Param0.length() + 1);    // starts just after the command
-    String rep = evaluate(ar); 
+    String rep = evaluate(ar);
     udp.beginPacket(UdpRemoteIP, UdpRemotePort);
     //    Serial.println(UdpRemoteIP);
     //    Serial.println(UdpRemotePort);
-    
+
     udp.write(rep.c_str());
     udp.endPacket();
     return;
   }
 
-  
-  
+
+
   if (Param0 == F("udpstop"))
   {
     udp.stop();
@@ -1262,10 +1449,10 @@ void ExicuteTheCurrentLine()
       UdpBranchLine = i - 1;
       return;
     }
-    PrintAndWebOut(F("UdpBranch line not found!"));
-    //    Serial.print("udpbranch");
-    //    Serial.println(UdpBranchLine);
-    return;    
+    SendErrorMsg(F("UdpBranch line not found!"));
+
+	
+    return;
   }
 
   if (Param0 == F("serialbranch"))
@@ -1277,8 +1464,8 @@ void ExicuteTheCurrentLine()
       SerialBranchLine = i - 1;
       return;
     }
-    PrintAndWebOut(F("SerialBranch line not found!"));
-    return;    
+    SendErrorMsg(F("SerialBranch line not found!"));
+    return;
   }
 
   if (Param0 == F("serial2branch"))
@@ -1290,9 +1477,9 @@ void ExicuteTheCurrentLine()
       Serial2BranchLine = i - 1;
       return;
     }
-    PrintAndWebOut(F("Serial2Branch line not found!"));
-    return;    
-  }  
+    SendErrorMsg(F("Serial2Branch line not found!"));
+    return;
+  }
 
   if (Param0 == F("irbranch"))
   {
@@ -1303,11 +1490,50 @@ void ExicuteTheCurrentLine()
       IRBranchLine = i - 1;
       return;
     }
-    PrintAndWebOut(F("IRBranch line not found!"));
-    return;    
-  }    
+    SendErrorMsg(F("IRBranch line not found!"));
+    return;
+  }
+
+  if (Param0 == F("websockeventbranch"))
+  {
+    WebSockEventBranchLine = 0;
+    int i;
+    if ((i = JumpList.getPos(Param1)) != -1)
+    {
+      WebSockEventBranchLine = i - 1;
+      return;
+    }
+    SendErrorMsg(F("WebSockEventBranch line not found!"));
+    return;
+  }
+
+  if (Param0 == F("websockchangebranch"))
+  {
+    WebSockChangeBranchLine = 0;
+    int i;
+    if ((i = JumpList.getPos(Param1)) != -1)
+    {
+      WebSockChangeBranchLine = i - 1;
+      return;
+    }
+    SendErrorMsg(F("WebSockChangeBranch line not found!"));
+    return;
+  }
+#if defined(BASIC_TFT)
+  if (Param0 == F("touchbranch"))
+  {
+    TouchBranchLine = 0;
+    int i;
+    if ((i = JumpList.getPos(Param1)) != -1)
+    {
+      TouchBranchLine = i - 1;
+      return;
+    }
+    SendErrorMsg(F("TouchBranch line not found!"));
+    return;
+  }
   ////////////////////////////
-  
+#endif
   /////// NEW mid STUFF //////
   if ( Param0.startsWith(F("mid(")) )
   {
@@ -1322,42 +1548,42 @@ void ExicuteTheCurrentLine()
     }
     if (num_par != 0)  // no closing parenthesys ->Error
     {
-      PrintAndWebOut(F("Mid: missing closing parenthesys"));
+      SendErrorMsg(F("Mid: missing closing parenthesis"));
       return;
     }
     // check if the '=' follow
     int eq = inData.indexOf('=', i);
     if (eq == -1) // missing = on the line
     {
-      PrintAndWebOut(F("Mid: missing = on the line"));
+      SendErrorMsg(F("Mid: missing = on the line"));
       return;
     }
     Param1 = inData.substring(4 , i);
-     r = ExtractArguments(Param1);
+    r = ExtractArguments(Param1);
     DeAllocateArguments();
     if ( (num_args != 2) && (num_args != 3) )
     {
-      PrintAndWebOut(F("Mid: number of arguments not valid"));
+      SendErrorMsg(F("Mid: number of arguments not valid"));
       return;
     }
-     
- 
+
+
     // we need to check if the args are valid
     // first we must extract the variable name
     int com = inData.indexOf(',');
     Param2 = inData.substring(4, com);
     Param2.trim();
-     r = VariablePosition(Param2);
+    r = VariablePosition(Param2);
     if (r == -1)
     {
-      PrintAndWebOut(F("Mid: destination variable not defined"));
+      SendErrorMsg(F("Mid: destination variable not defined"));
       return;
     }
-     
+
     Param3 = evaluate(inData.substring( eq + 1 ));
     if (parser_result != PARSER_STRING)
     {
-      PrintAndWebOut(F("Mid: set value must be string"));
+      SendErrorMsg(F("Mid: set value must be string"));
       return;
     }
 
@@ -1387,34 +1613,36 @@ void ExicuteTheCurrentLine()
       }
       if (num_par != 0)  // no closing parenthesys ->Error
       {
-        PrintAndWebOut(F("DIM: missing closing parenthesys"));
+        SendErrorMsg(F("DIM: missing closing parenthesys"));
         return;
       }
 
       Param1 = inData.substring(3, r); // array name
       Param1.trim();
-      if (Param1 == "") 
+      if (Param1 == "")
       {
-        PrintAndWebOut(F("DIM: the array name is missing"));
+        SendErrorMsg(F("DIM: the array name is missing"));
         return;
       }
-      Param2 = inData.substring(r + 1 , i); // arguments
-      r = ExtractArguments(Param2);
-      DeAllocateArguments();
-      if (num_args != 1) 
+      Param2 = inData.substring(r+1 , i); // arguments
+
+	  Param2 = evaluate(Param2);
+
+	  
+      if (Param2.toInt() < 1)
       {
-        PrintAndWebOut(F("DIM: number of arguments must be 1"));
+        SendErrorMsg(F("DIM: number of elements must be greater than 0"));
         return;
       }
 
       // here we are OK, we can create the array; for the moment array with $ are string, without float
       // we should check before if the same array name exists
       if ((r = Search_Array(Param1)) != -1)
-         basic_arrays[r].remove();
+        basic_arrays[r].remove();
 
       if ( (r = Search_First_Available_Array()) == -1)
       {
-        PrintAndWebOut(F("DIM: no more array space available"));
+        SendErrorMsg(F("DIM: no more array space available"));
         return;
       }
 
@@ -1429,18 +1657,20 @@ void ExicuteTheCurrentLine()
 
   if (Param0 == F("undim"))
   {
-    // remove an already dimensioned array; maybe the name "undim" should be modified 
+    // remove an already dimensioned array; maybe the name "undim" should be modified
     if ( (r = Search_Array(Param1)) == -1)
     {
-      PrintAndWebOut(F("UNDIM: array not defined"));
+      SendErrorMsg(F("UNDIM: array not defined"));
       return;
     }
-        
+
     basic_arrays[r].remove();
     return;
   }
 
+
   
+
   /// NEW array identification //
   if ((r = Param0.indexOf('(')) != -1) // there is a parenthesys in the command; maybe it's an array
   {
@@ -1455,33 +1685,33 @@ void ExicuteTheCurrentLine()
     }
     if (num_par != 0)  // no closing parenthesys ->Error
     {
-      PrintAndWebOut(F("Array: missing closing parenthesys"));
+      SendErrorMsg(F("Array: missing closing parenthesis"));
       return;
     }
     // check if the '=' follow
     int eq = inData.indexOf('=', i);
     if (eq != -1) // the '=' is present on the line; so this should be an array init
     {
-        //{  PrintAndWebOut(F("Array: missing = on the line"));  return; }      
-      Param1 = Param0.substring(0, r); // array name
+      //{  PrintAndWebOut(F("Array: missing = on the line"));  return; }
+      Param1 = getValue(inData, ' ', 0).substring(0, r); // array name
       Param1.trim();
       Param2 = inData.substring(r + 1 , i); // arguments
       r = ExtractArguments(Param2);
       DeAllocateArguments();
-      if (num_args != 1) 
+      if (num_args != 1)
       {
-        PrintAndWebOut(F("Array: number of arguments must be 1"));
+        SendErrorMsg(F("Array: number of arguments must be 1"));
         return;
       }
-  
+
       Param3 = evaluate(inData.substring( eq + 1 ));
-  
+
       if ( (r = Search_Array(Param1)) == -1)
       {
-        PrintAndWebOut(F("Array not defined"));
+        SendErrorMsg(F("Array not defined"));
         return;
       }
-  
+
       if (basic_arrays[r].Format == PARSER_STRING) // string format
       {
         basic_arrays[r].setString(args[0], Param3);
@@ -1504,7 +1734,7 @@ void ExicuteTheCurrentLine()
   if ( Param0.indexOf('=') > 1 )
   { //Serial.println("Found the  = sign");
     inData.replace(F("="), F(" = "));
-    Param0 = "let";
+    Param0 = F("let");
   }
 
 
@@ -1563,3 +1793,66 @@ void ExicuteTheCurrentLine()
   //WaitForTheInterpertersResponse = 1;
   return;
 }
+
+
+IPAddress StringToIP(String x)
+{
+  IPAddress _IP;
+  // convert it from String to int
+  int st = 0;
+  int en;
+  for (int i = 0; i < 4; i++)
+  {
+    en = x.indexOf('.', st);
+    _IP[i] =  x.substring(st, en).toInt();
+    st = en + 1;
+  }
+  return _IP;
+}
+
+int parserotto(String st, String res[10])
+{
+  int i;
+  bool quotes = false;
+  bool vertbars = false;
+  int parenthesys = 0;
+  int positions[10]; // position of the commas for 10 arguments max
+  int j = 0;
+  char c;
+  for (i = 0; i < st.length(); i++)
+  {
+    c = st[i];
+    if ( (c == '"') && (vertbars == false) )
+      quotes = !quotes;
+    if ( (c == '|') && (quotes == false) )
+      vertbars = !vertbars;
+
+    if (c == '(') parenthesys++;
+    if (c == ')') parenthesys--;
+
+    if (c == ',')  // if the comma is found
+    { // if the quotes, vertical bars and parenthesys are closed
+      if ( (quotes == false) && (vertbars == false) && (parenthesys == 0) )
+      {
+        // this is a valid split point
+        positions[j++] = i;
+      }
+    }
+  }
+  positions[j++] = st.length();  // last arguments goes until the end
+  if ( (quotes == false) && (vertbars == false) && (parenthesys == 0) )
+  {
+    int pos_prev = -1;
+    for (i = 0; i < j; i++)
+    {
+      res[i] = st.substring(pos_prev + 1, positions[i]);
+      res[i].trim();
+      pos_prev = positions[i];
+    }
+    return j;
+  }
+  else
+  {
+    return -1;
+  }
+}
diff --git a/ESP8266Basic/ESP8266Basic.ino b/ESP8266Basic/ESP8266Basic.ino
index 744786d..cb4dd1b 100644
--- a/ESP8266Basic/ESP8266Basic.ino
+++ b/ESP8266Basic/ESP8266Basic.ino
@@ -1,3 +1,5 @@
+//#define BASIC_TFT
+
 //ESP8266 Basic Interpreter
 //HTTP://ESP8266BASIC.COM
 //
@@ -23,13 +25,28 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-//Onewire tempture sensor code conntributed by Rotohammer.
+//Onewire temperature sensor code contributed by Rotohammer.
 
-//Signnifigant speed improvements submited by cicciocb
+//Significant speed improvements submitted by cicciocb
 //Uploading of bas files improvement added by cicciocb
 //JSON parsing routine added by cicciocb
 
 
+
+// Comment or uncomment following lines to produce a custom build omitting features.
+
+
+
+
+
+
+
+
+#include <WebSocketsServer.h>
+#include <Hash.h>
+#include <WebSockets.h>
+
+
 //#include <ArduinoJson.h>
 #include "spiffs/spiffs.h"
 #include <FS.h>
@@ -49,18 +66,26 @@
 #include "Base64.h"
 
 //#include <WiFiClientSecure.h>
+#if defined(BASIC_TFT)
 #include "ESP8266httpUpdate.h"
+#endif
 #include <time.h>
-//#include <HttpClient.h>                   // that line needs to be commented for esp8266-2.0.0-rc1
 #include <ESP8266HTTPClient.h>              // that line needs to be added for the esp8266-2.0.0 and 2.1.0-rc2
 
+//Ping stuff
+#include <ESP8266Ping.h>
+
+
+
 //LCD Stuff
+ #if defined(BASIC_TFT)
 #include <LiquidCrystal_SR.h>
 #include <I2CIO.h>
 #include <LiquidCrystal.h>
 #include <LiquidCrystal_SR3W.h>
 #include <LCD.h>
 #include <LiquidCrystal_SR2W.h>
+#endif
 //#include <FastIO.h>
 #include <LiquidCrystal_I2C.h>
 
@@ -76,10 +101,20 @@ Adafruit_NeoPixel *pixels = NULL;
 #include <SoftwareSerial.h>
 SoftwareSerial *swSer = NULL;
 
+#include "VERSION.h"
+
+
+
 //ThingSpeak Stuff
 
 
-PROGMEM const char BasicVersion[] = "ESP Basic 2.0.Alpha 24";
+
+
+//wifi mode exclusivity 
+bool wifiApStaModeOn = 0;
+//WIFI SCANN STUFF
+int numberOfWifiScanResults;
+
 
 // SPI STUFF
 #include <SPI.h>
@@ -87,10 +122,13 @@ PROGMEM const char BasicVersion[] = "ESP Basic 2.0.Alpha 24";
 // Infrared Stuff
 #include <IRremoteESP8266.h>
 IRsend *irsend = NULL; //irsend(0); //an IR led is connected to GPIO pin 0
-IRrecv *irrecv = NULL; 
+IRrecv *irrecv = NULL;
 decode_results IRresults;
 int IRBranchLine = 0;
 
+
+
+#if defined(BASIC_TFT)
 //ILI9341 Stuff
 #include <Adafruit_GFX.h>
 #include <Adafruit_ILI9341.h>
@@ -99,9 +137,18 @@ int IRBranchLine = 0;
 //#define TFT_CS 5
 // Use hardware SPI (on Uno, #13, #12, #11) and the above for CS/DC
 Adafruit_ILI9341 *tft = NULL; //= Adafruit_ILI9341(TFT_CS, TFT_DC);
-
-
-
+byte TFT_CS_pin, TFT_DC_pin;
+#include "TFT_Objects.h"
+TFT_Form form1(40);
+
+// touch stuff
+byte Touch_CS_pin;
+int TouchBranchLine = 0;
+int Touch_p = 0;
+unsigned int Touch_millis = 0;
+uint16_t touchX, touchY;
+uint16_t touchX_raw, touchY_raw;
+#endif
 
 // The Math precision is defined, by default, inside expression_parser_string.h
 // there is a definition PARSER_PREC that can be double or float
@@ -121,7 +168,20 @@ DallasTemperature sensors(&oneWire);
 //DHT dht(5, DHT21);   // 5 is GPIO5, DHT21 you may want change at DHT11 or DHT22
 DHT *dht = NULL;
 
+
+ #if defined(BASIC_TFT)
 LiquidCrystal_I2C lcd(0x27, 2, 1, 0, 4, 5, 6, 7, 3, POSITIVE); // Set the LCD I2C address
+#endif
+
+// i2c OLED Display
+
+#if defined(BASIC_TFT)
+#include "SSD1306.h" 
+SSD1306  display(0x3c);
+#endif
+
+
+
 
 //PS2Keyboard keyboard;
 
@@ -134,43 +194,110 @@ String EmailSMTPpassword;
 // udp client
 WiFiUDP udp;
 
+// WebSockets
+WebSocketsServer *webSocket;
+String WebSockMessage;
+int WebSockEventBranchLine = 0;
+int WebSockChangeBranchLine = 0;
+String WebSockEventName;
+String WebSockChangeName;
+int WebSocketTimeOut[5];
+int delaytime;
+
 WiFiClient client;
+WiFiClient clientTelnet;
+int telnetBranch;
+
+//MQTT Stuff
+#include <PubSubClient.h>
+//#include "Adafruit_MQTT.h"
+//#include "Adafruit_MQTT_Client.h"
+PubSubClient MQTTclient(client);
+String MQTTlatestMsg;
+bool MQTTnewMsgReceived ;
+bool MQTTActivated;
+String MQTTBranch;
+String MQTTSubscribeTopic;
+String MQTTPublishTopic;
+String MQTTPublishMSG;
+int MQTTTimeFromLastCheck;
+
+
 ESP8266WebServer *server; //server(80);
 
 //Web Server Variables
+byte WebGuiOff = 0;
 String HTMLout;
 PROGMEM const char InputFormText[] = R"=====( <input type="text" id="myid" name="input"><input type="submit" value="Submit" name="inputButton"><hr>)=====";
-PROGMEM const char TextBox[] = R"=====( <input type="text" id="myid" name="variablenumber" value="variablevalue">)=====";
-PROGMEM const char passwordbox[] = R"=====( <input type="password" id="myid" name="variablenumber" value="variablevalue">)=====";
-PROGMEM const char Slider[] = R"=====( <input type="range" id="myid" name="variablenumber" min="minval" max="maxval" value=variablevalue>)=====";
-PROGMEM const char GOTObutton[] =  R"=====(<input type="submit" id="myid" value="gotonotext" name="gotonobranch">)=====";
-PROGMEM const char GOTOimagebutton[] =  R"=====(<input type="image" id="myid" src="/file?file=gotonotext" value="gotonotext" name="gotonobranch">)=====";
+PROGMEM const char TextBox[] = R"=====(<input type="text" id="myid" name="variablenumber" value="variablevalue" onchange="objChange(this)">)=====";
+PROGMEM const char passwordbox[] = R"=====( <input type="password" id="myid" name="variablenumber" value="variablevalue" onchange="objChange(this)">)=====";
+PROGMEM const char Slider[] = R"=====( <input type="range" id="myid" name="variablenumber" min="minval" max="maxval" onchange="objChange(this)" value=variablevalue >)=====";
+PROGMEM const char GOTObutton[] =  R"=====(<button id="myid" onclick="cmdClick(this)" name="gotonobranch">gotonotext</button>)=====";
+PROGMEM const char GOTOimagebutton[] =  R"=====(<input type="image" onclick="cmdClick(this)" id="myid" src="/file?file=gotonotext" value="gotonotext" name="gotonobranch">)=====";
 PROGMEM const char normalImage[] =  R"=====(<img src="/file?file=name">)=====";
 PROGMEM const char javascript[] =  R"=====(<script src="/file?file=name"></script>)=====";
 PROGMEM const char CSSscript[] =  R"=====(<link rel="stylesheet" type="text/css" href="/file?file=name">)=====";
-PROGMEM const char DropDownList[] =  R"=====(<select name="variablenumber" id="myid" size="theSize">options</select>
-<script>document.getElementsByName("variablenumber")[0].value = "VARS|variablenumber";</script>)=====";
+PROGMEM const char CSSid[] =  R"=====(<style>#myid {*style*}</style>)=====";
+PROGMEM const char CSSclass[] =  R"=====(<style>myid {*style*}</style>)=====";
+PROGMEM const char DropDownList[] =  R"=====(<select name="variablenumber" id="myid" onchange="objChange(this)" size="theSize">options</select><script>document.getElementsByName("variablenumber")[0].value = "VARS|variablenumber";</script>)=====";
 PROGMEM const char DropDownListOpptions[] =  R"=====(<option>item</option>)=====";
-
+PROGMEM const char meter[] =  R"=====(<meter id="myid" name="variablenumber" value="variablevalue" min="minval" max="maxval"></meter>)=====";
 
 String LastElimentIdTag;
 
 PROGMEM const char MobileFreindlyWidth[] = R"=====(<meta name="viewport" content="width=device-width, initial-scale=1.0">)=====";
 
+ #if defined(BASIC_TFT)
+PROGMEM const char DebugPage[] =  R"=====(</script><script src='WebSockets.js'></script><script src='wsport.js'></script>
+<div id="fooBar" style="float:left; width:20%;">Vars<hr></div>
+<DIV style="float:left; width:35%;">
+<button id="run" onclick="dcmdClick(this)">Run</button>
+<button id="stop" onclick="dcmdClick(this)">Stop</button>
+<button id="pause" onclick="dcmdClick(this)">Pause</button>
+<button id="continue" onclick="dcmdClick(this)">Continue</button>
+<input type="text" id="connection_status" value="Disconnected">
+<button id="clear" onclick="logClear()">Clear</button>
+Speed
+<input type="text" id="speed" name="speed" value="*speed*"onchange="objChange(this)">
+<br>Line No<input type="text" id="lno" value="line no">
+<br><select id='code' size=35 style="width:100%"></select>
+<textarea rows="20" style="width:100%;height:40%" id="log">log</textarea>
+</DIV>
+<div id="app" style="float:left; width:40%;">
+)=====";
+#else
+PROGMEM const char DebugPage[] =  R"=====( )=====";
+#endif
+
+
+
 byte WaitForTheInterpertersResponse = 1;
 
+
+ #if defined(BASIC_TFT)
 PROGMEM const char AdminBarHTML[] = R"=====(
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="stylesheet" type="text/css" href="/file?file=skin.css">
 <a href="./vars">[ VARS ]</a> 
 <a href="./edit">[ EDIT ]</a>
 <a href="./run">[ RUN ]</a>
+<a href="./debug">[ DEBUG ]</a>
+<a href="./settings">[ SETTINGS ]</a>
+<a href="./filemng">[ FILE MANAGER ]</a>
+<hr>)=====";
+#else
+PROGMEM const char AdminBarHTML[] = R"=====(
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<a href="./edit">[ EDIT ]</a>
+<a href="./run">[ RUN ]</a>
 <a href="./settings">[ SETTINGS ]</a>
 <a href="./filemng">[ FILE MANAGER ]</a>
 <hr>)=====";
+#endif
 
 
 
+ #if defined(BASIC_TFT)
 PROGMEM const char UploadPage[] = R"=====(
 <form method='POST' action='/filemng' enctype='multipart/form-data'>
 <input type='file' name='Upload'>
@@ -182,9 +309,82 @@ PROGMEM const char UploadPage[] = R"=====(
 <input type="submit" value="Edit" name="Edit">
 <input type="submit" value="Rename" name="Rename">
 </form>
+<select name="fileName" size="25" form="filelist"></select>
+</script><script src='filmanws.js'></script>
+</script><script src='wsport.js'></script>
+)=====";
+
 
+
+
+PROGMEM const char FIleManWSJS[] =  R"=====(
+function start(websocketServerLocation) {
+	connection = new WebSocket(websocketServerLocation);
+	connection.onopen = function() {
+		connection.send("OK");
+		connection.send('filelist')		
+	};
+	connection.onclose = function() {
+		setTimeout(function() { start(websocketServerLocation)}, 1000);
+	};
+
+	connection.onmessage = function(e) {
+		var res = e.data.split("~^`");
+
+		
+		if (res[0].toLowerCase() == "filename") {
+			connection.send("OK");
+			
+			var x = document.getElementsByName("fileName")[0];
+			var option = document.createElement("option");
+			option.text = res[1];
+			x.add(option);
+			return;
+		}
+	};
+}
+var aliveme = setInterval(aliveTimer, 5000);
+function aliveTimer() {
+	connection.send("OK");
+}
+)=====";
+#else
+PROGMEM const char UploadPage[] = R"=====(
+<form method='POST' action='/filemng' enctype='multipart/form-data'>
+<input type='file' name='Upload'>
+<input type='submit' value='Upload'>
+</form>
+<form id="filelist">
+<input type="submit" value="Delete" name="Delete">
+<input type="submit" value="View" name="View">
+<input type="submit" value="Edit" name="Edit">
+<input type="submit" value="Rename" name="Rename">
+</form>
 <select name="fileName" size="25" form="filelist">*table*</select>
+<script>
+function call() {
+	var x = document.getElementsByName("fileName")[0];
+	var optionVal = new Array();
+	for (i = 0; i < x.length; i++) {
+		optionVal.push(x.options[i].text);
+	}
+	for (i = x.length; i >= 0; i--) {
+		x.remove(i);
+	}
+	optionVal.sort();
+	for (var i = 0; i < optionVal.length; i++) {
+		var opt = optionVal[i];
+		var el = document.createElement("option");
+		el.textContent = opt;
+		el.value = opt;
+		x.appendChild(el);
+	}
+}
+</script>
+<body onload="call()">
 )=====";
+#endif
+
 
 
 
@@ -192,32 +392,238 @@ PROGMEM const char UploadPage[] = R"=====(
 
 PROGMEM const char EditorPageHTML[] =  R"=====(
 <script src="editor.js"></script>
+<script src="/file?file=codemirror.js.gz"></script>
+<link rel="stylesheet" href="/file?file=codemirror.css.gz">
 <form action='edit' id="usrform">
 <input type="text" id="FileName" name="name" value="*program name*">
 <input type="submit" value="Open" name="open">
 </form>
-<button onclick="ShowTheFileList()">Files List</button>
 <button onclick="SaveTheCode()">Save</button>
 <br>
 <textarea rows="30" style="width:100%" name="code" id="code">*program txt*</textarea><br>
 <input type="text" id="Status" value="">
+<script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+lineNumbers: true,
+indentUnit: 4});
+</script>
 )=====";
 
 
+
+PROGMEM const char WebSocketsJS[] =  R"=====(
+function start(websocketServerLocation) {
+	connection = new WebSocket(websocketServerLocation);
+	connection.onopen = function() {
+		connection.send('OK');
+		connection.send("vars");
+		document.getElementById("connection_status").value = "Connected";
+	};
+	connection.onclose = function() {
+		setTimeout(function() {
+			start(websocketServerLocation)
+		}, 1000);
+		document.getElementById("connection_status").value = "Disconnected";
+	};
+
+	connection.onmessage = function(e) {
+		var res = e.data.split("~^`");
+		if (res[0].toLowerCase() == "var") {
+			connection.send("OK");
+			for (i = 0; i < document.getElementsByName(res[1]).length; i++) {
+				document.getElementsByName(res[1])[i].value = res[2];
+			}
+
+			return;
+		}
+		if (res[0].toLowerCase() == "varname") {
+			connection.send("OK");
+			document.getElementsByName("var" + res[1].toString())[0].value = res[2];
+			return;
+		}
+		if (res[0].toLowerCase() == "code") {
+			connection.send("OK");
+			document.getElementById("lno").value = res[1];
+			document.getElementById('code').value = res[1];
+			return;
+		}
+
+		if (res[0].toLowerCase() == "print") {
+			AddToBody('<hr>' + res[1]);
+			connection.send("vars");
+			return;
+		}
+		if (res[0].toLowerCase() == "gupdate") {
+			document.getElementsByName('gra')[0].contentWindow.location.reload();
+			return;
+		}
+
+		if (res[0].toLowerCase() == "guicls") {
+			if (document.getElementById("app")) 
+				{
+				var bla = document.getElementById('app');
+				bla.innerHTML = '';
+				}
+			else
+				{
+				document.body.innerHTML = '';
+				}
+			location.reload();
+			return;
+		}
+		if (res[0].toLowerCase() == "wprint") {
+			AddToBody(res[1]);
+			connection.send("vars");
+			return;
+		} else if (res[0].toLowerCase() == "get") {
+			var obj = document.getElementById(res[1]);
+			if (obj == null) {
+				connection.send("unknown object");
+				return;
+			}
+			connection.send(obj.value);
+			return;
+		} else if (res[0].toLowerCase() == "log") {
+			connection.send('OK');
+			var log = document.getElementById("log");
+			log.value = "\n" + res[1] + log.value;
+			log.selectionStart = log.selectionEnd = log.value.length;
+			return;
+		} else if (res[0].toLowerCase() == "call") {
+			connection.send('OK');
+			eval(res[1] + '();');
+			return;
+		} else {
+			// default 
+			connection.send("KO");
+		}
+	};
+}
+
+function dcmdClick(e) {
+	connection.send("cmd:" + e.id);
+}
+
+function cmdClick(e) {
+	connection.send("guicmd:" + e.name);
+}
+
+function logClear() {
+	document.getElementById('app').innerHTML ='';
+	document.getElementById("log").value = '';
+}
+
+function objEvent(e) {
+	connection.send("guievent:" + e.name + ":" + document.getElementById(e.id).value);
+}
+
+function objChange(e) {
+	connection.send("guichange~" + e.name + "~" + document.getElementById(e.id).value);
+}
+
+var aliveme = setInterval(aliveTimer, 5000);
+
+function aliveTimer() {
+	connection.send("OK");
+}
+
+window.onload = function makeVarList() {
+	for (xxx = 0; xxx < 101; xxx++) {
+		add(xxx.toString(), "");
+	}
+	var arrayOfLines = localStorage.getItem("lastcode").split("\n");
+	var sel = document.getElementById('code');
+	for (i = 0; i < arrayOfLines.length; i++) 
+	{ 
+	  x = i + 1;
+	  if (arrayOfLines[i] != "undefined")
+	  {
+		var opt = document.createElement('option');
+		opt.innerHTML = pad('.....',i+1,true)+ ':    ' + arrayOfLines[i];
+		opt.value = i+1;
+		sel.appendChild(opt);
+	  }
+	}
+}
+
+
+function pad(pad, str, padLeft) {
+  if (typeof str === 'undefined') 
+	return pad;
+  if (padLeft) {
+	return (pad + str).slice(-pad.length);
+  } else {
+	return (str + pad).substring(0, pad.length);
+  }
+}
+
+//Create text boxes for variables
+function add(itemName, itemValue) {
+
+	var element = document.createElement("input");
+	element.setAttribute("type", "text");
+	element.setAttribute("value", itemValue);
+	element.setAttribute("name", "var" + itemName);
+	element.setAttribute("style", "width:50%");
+
+	var element1 = document.createElement("input");
+	element1.setAttribute("type", "text");
+	element1.setAttribute("value", itemValue);
+	element1.setAttribute("name", itemName);
+	element1.setAttribute("style", "width:50%");
+
+
+	document.getElementById("fooBar").appendChild(element);
+	document.getElementById("fooBar").appendChild(element1);
+}
+
+
+function removeSpecials(str) {
+	var lower = str.toLowerCase();
+	var upper = str.toUpperCase();
+
+	var res = "";
+	for(var i=0; i<lower.length; ++i) {
+		if(lower[i] != upper[i] || lower[i].trim() === '')
+			res += str[i];
+	}
+	return res;
+}
+
+function AddToBody(str){
+if (document.getElementById("app")) 
+	{
+	var bla = document.getElementById('app');
+	bla.innerHTML += str ;}
+else
+	{
+	document.body.innerHTML +=str;
+	}
+}
+)=====";
+
+
+
+
+
+
 PROGMEM const char editCodeJavaScript[] =  R"=====(
 function SaveTheCode() {
+  if (typeof editor != "undefined") {editor.save();}
   var textArea = document.getElementById("code");
+  localStorage.setItem("lastcode", textArea.value);
   var arrayOfLines = textArea.value.split("\n");
   httpGet("/codein?SaveTheCode=start&FileName="+document.getElementById("FileName").value);
   httpGet("/codein?SaveTheCode=yes");
   block = 0;
+  document.getElementById("Status").value = "";
 for (i = 0; i < arrayOfLines.length; i++) 
 { 
   x = i + 1;
   if (arrayOfLines[i] != "undefined")
   {
-    stocca(encodeURIComponent(arrayOfLines[i]));
-    document.getElementById("Status").value = i.toString();
+	stocca(encodeURIComponent(arrayOfLines[i]));
+	
   }
 }
 stocca(">>-save_<<");
@@ -244,22 +650,17 @@ function stocca(s)
    Sendy += "%0D%0A";
  }
 }
-function ShowTheFileList(){
-  var filelist;
-  filelist = httpGet("/filelist?all=true");
-  alert("List of the Files saved :\n\r" + filelist);
-}
 function httpGet(theUrl)
 {
-    var xmlHttp = new XMLHttpRequest();
-    xmlHttp.open( "GET", theUrl, false ); // false for synchronous request
-    xmlHttp.send( null );
-    return xmlHttp.responseText;
+	var xmlHttp = new XMLHttpRequest();
+	xmlHttp.open( "GET", theUrl, false ); // false for synchronous request
+	xmlHttp.send( null );
+	return xmlHttp.responseText;
 }
 function replaceAll(str, find, replace) {
   for (x = 0; x <= 10; x++) 
   {
-    str = str.replace(find, replace);
+	str = str.replace(find, replace);
   }
   return str;
 }
@@ -267,32 +668,39 @@ function replaceAll(str, find, replace) {
 
 
 PROGMEM const char SettingsPageHTML[] =  R"=====(
-<form action='settings' id="usrform"><table>
+<form action='settings' id="usrform">
 *BasicVersion*
-<tr><th>
-Station Mode (Connect to your router):</th></tr>
-<tr><th><p align="right">Name:</p></th><th><input type="text" name="staName" value="*sta name*"></th></tr>
-<tr><th><p align="right">Pass:</p></th><th><input type="password" name="staPass" value="*sta pass*"></th></tr>
-<tr><th>
-<br><br>Ap mode (ESP brocast out its own ap):</th></tr>
-<tr><th><p align="right">Name:</p></th><th><input type="text" name="apName" value="*ap name*"></th></tr>
-<tr><th><p align="right">Pass:<br>Must be at least 8 characters</p></th><th><input type="password" name="apPass" value="*ap pass*"></th></tr>
-<tr><th>
-<br><br>Log In Key (For Security):</th></tr>
-<tr><th><p align="right">Log In Key:</p></th><th><input type="password" name="LoginKey" value="*LoginKey*"></th></tr>
-<tr><th><p align="right">Display menu bar on index page:</p></th><th><input type="checkbox" name="showMenueBar" value="off" **checked**> Disable<br></th></tr>
-<tr><th><p align="right">Run default.bas at startup :</p></th><th><input type="checkbox" name="autorun" value="on" **autorun**> Enable<br></th></tr>
-<tr><th><p align="right">Server listening port:</p></th><th><input type="text" name="listenport" value="*listenport*"></th></tr>
-<tr><th><p align="right">OTA URL. Leave blank for default:</p></th><th><input type="text" name="otaurl" value="*otaurl*"></th></tr>
-<tr><th>
+<style>div {width: 270px;text-align: right;}</style>
+<div>
+<b>Station Mode (Connect to router):</b>
+<div>Name:<input type="text" name="staName" value="*sta name*"></div>
+<div>Pass:<input type="password" name="staPass" value="*sta pass*"></div>
+</div>
+<div>
+<b>Ap mode (brocast out its own ap):</b>
+<div>Name:<input type="text" name="apName" value="*ap name*"></div>
+<div>Pass (8 characters):<input type="password" name="apPass" value="*ap pass*"></div>
+</div>
+<div>
+<b>IP (STA or AP mode):</b>
+<div>IP address:<input type="text" name="ipaddress" value="*ipaddress*"></div>
+<div>Subnet mask:<input type="text" name="subnetmask" value="*subnetmask*"></div>
+<div>gateway:<input type="text" name="gateway" value="*gateway*"></div>
+<div>HTTP port:<input type="text" name="listenport" value="*listenport*"></div>
+<div>WS port:<input type="text" name="wsport" value="*wsport*"></div>
+</div>
+<div>
+<div>Log In Key:<input type="password" name="LoginKey" value="*LoginKey*"></div>
+<div>Menu bar Disable:<input type="checkbox" name="showMenueBar" value="off" **checked**></div>
+<div>Run default.bas at startup:<input type="checkbox" name="autorun" value="on" **autorun**></div>
+<div>OTA URL<input type="text" name="otaurl" value="*otaurl*"></div>
+</div>
+<div>
 <input type="submit" value="Save" name="save">
 <input type="submit" value="Format" name="format">
 <input type="submit" value="Update" name="update">
 <input type="submit" value="Restart" name="restart">
-</th></tr>
-</table></form>
-<br>
-)=====";
+</div></form><br>)=====";
 
 
 
@@ -310,6 +718,7 @@ Log In Key
 
 
 //Graphics HTML CODE
+#if defined(BASIC_TFT)
 
 PROGMEM const char GraphicsStartCode[] =  R"=====(<svg width="*wid*" height="*hei*">)=====";
 
@@ -321,11 +730,18 @@ PROGMEM const char GraphicsEllipseCode[] =  R"=====(<ellipse cx="*x1*" cy="*y1*"
 
 PROGMEM const char GraphicsRectangleCode[] =  R"=====(<rect x="*x1*" y="*y1*" width="*x2*" height="*y2*" style="fill:*collor*"/>)=====";
 
+PROGMEM const char GraphicsTextCode[] =  R"=====(<text x="*x1*" y="*y1*" style="fill:*collor*" transform="rotate(*x2* *x1*,*y1*)">*text*</text>)=====";
+#endif
+
+
 byte numberButtonInUse = 0;
-String ButtonsInUse[20];
+//String ButtonsInUse[20];
+
 
+bool NewGuiItemAddedSinceLastWait;
+bool NewGraphicItemAddedSinceLastWait;
 
-String   msgbranch;
+int  msgbranch;
 String   MsgBranchRetrnData;
 
 int UdpBranchLine = 0;
@@ -344,11 +760,11 @@ String inData;
 
 const int TotalNumberOfLines = 5000;            //this is the maximum number of lines that can be saved/loaded; it can go until 65535
 int  program_nb_lines = 0;                      //this is the number of program lines read from the file
- 
+
 int LastVarNumberLookedUp;                                 //Array to hold all of the basic variables
 bool VariableLocated;
 
-const int TotalNumberOfVariables = 50;
+const int TotalNumberOfVariables = 100;
 #define VariablesNameLength  30
 #include "Classes.h"
 
@@ -356,15 +772,18 @@ bool RunningProgram = 1;                                //Will be set to 1 if th
 int RunningProgramCurrentLine = 0;                     //Keeps track of the currently running line of code
 //byte NumberOfReturns;
 bool BasicDebuggingOn;
+int debugDelaySpeed;
 //uint16_t ReturnLocations[254];
 
 int TimerWaitTime;
 int timerLastActiveTime;
+int timercbLastActiveTime;
 String TimerBranch;
 
 String refreshBranch;
 
 uint16_t GraphicsEliments[100][7];
+String GraphicsText[100];
 
 File fsUploadFile;
 
@@ -381,23 +800,15 @@ int LoggedIn = 0;
 int SerialTimeOut;
 
 
+int TimerCBtime = 0;
+int TimerCBBranchLine;
 
 //uint16_t ForNextReturnLocations[255];
 
 
 
-Servo Servo0;
-Servo Servo1;
-Servo Servo2;
-Servo Servo3;
-Servo Servo4;
-Servo Servo5;
+Servo servos[11];
 
-Servo Servo12;
-Servo Servo13;
-Servo Servo14;
-Servo Servo15;
-Servo Servo16;
 
 String  PinListOfStatus[17];
 int  PinListOfStatusValues[17];
@@ -412,293 +823,333 @@ int dst = 0;
 FSInfo fs_info;
 
 void setup() {
-//  dht.begin();
-//  pixels.begin();
+  //  dht.begin();
+  //  pixels.begin();
   SPIFFS.begin();
   Serial.begin(9600);
   // gets the listening port
   String listenport = LoadDataFromFile("listenport");
+  String WebSocketslistenport = LoadDataFromFile("wsport");
   // listening port - by default goes to 80 -
-  if (listenport.toInt() == 0)
-    listenport = F("80");
+  if (listenport.toInt() == 0) listenport = "80";
+  if (WebSocketslistenport.toInt() == 0) {WebSocketslistenport = F("81"); SaveDataToFile(F("wsport"), WebSocketslistenport);}
 
   // print the listening port in the console
-  Serial.print(F("\nServer listening Port: "));
-  Serial.println(listenport.toInt());
+  Serial.println("HTTP Port: " + listenport);
   // create the instance of the web server
   server = new ESP8266WebServer(listenport.toInt());
+  webSocket = new WebSocketsServer(WebSocketslistenport.toInt());
+  
   
+
   //Serial.setDebugOutput(true);
+  WiFi.setAutoConnect(false) ;
   WiFi.mode(WIFI_AP_STA);
   PrintAndWebOut(BasicVersion);
+  PrintAndWebOut("MAC: " + WiFi.softAPmacAddress());
   //CheckWaitForRunningCode();
+  
+  MQTTclient.setCallback(MQTTcallback);
+
 
   server->on("/", []()
   {
-    String WebOut;
-    if (LoadDataFromFile("ShowMenueBar") != "off") WebOut =    AdminBarHTML;
-    WebOut += RunningProgramGui();
-    server->send(200, "text/html", WebOut);
+	String WebOut;
+	if (LoadDataFromFile("ShowMenueBar") != "off") WebOut =    AdminBarHTML;
+	WebOut += RunningProgramGui();
+	server->send(200, F("text/html"), WebOut);
   });
 
 
   server->on("/settings", []()
   {
 
-    server->send(200, "text/html", SettingsPageHandeler());
+	server->send(200, F("text/html"), SettingsPageHandeler());
   });
 
 
-
+#if defined(BASIC_TFT)
   server->on("/vars", []()
   {
-    String WebOut = AdminBarHTML;
-    String FixSpaces;
-    if ( CheckIfLoggedIn() )
-    {
-      WebOut = LogInPage;
-    }
-    else
-    {
-      WebOut += F("<div style='float: left;'>Variable Dump:");
-      for (int i = 0; i < TotalNumberOfVariables; i++)
-      {
-        FixSpaces = AllMyVariables[i].getVar();
-        FixSpaces.replace(' ' , char(160));
-        if ( AllMyVariables[i].getName() != "") WebOut += String("<hr>" + AllMyVariables[i].getName() + " = " + (AllMyVariables[i].Format == PARSER_STRING ? "\"" : "") +
-                                                                                            FixSpaces         + (AllMyVariables[i].Format == PARSER_STRING ? "\"" : "") );
-      }
-
-
-      WebOut += F("<hr></div><div style='float: right;'>Pin Stats");
-      for (byte i = 0; i <= 15; i++)
-      {
-        if ( i < 6 | i > 11) WebOut += String("<hr>" + String(i) + " = " + PinListOfStatus[i] + "  , " + String(PinListOfStatusValues[i]));
-      }
-      WebOut += "</div>";
-    }
-
-    server->send(200, "text/html", WebOut);
+	String WebOut = AdminBarHTML;
+	String FixSpaces;
+	if ( CheckIfLoggedIn() )
+	{
+	  WebOut = LogInPage;
+	}
+	else
+	{
+	  WebOut += F("<div style='float: left;'>Variable Dump:");
+	  for (int i = 0; i < TotalNumberOfVariables; i++)
+	  {
+		FixSpaces = AllMyVariables[i].getVar();
+		FixSpaces.replace(' ' , char(160));
+		if ( AllMyVariables[i].getName() != "") WebOut += String("<hr>" + AllMyVariables[i].getName() + " = " + (AllMyVariables[i].Format == PARSER_STRING ? "\"" : "") +
+			  FixSpaces         + (AllMyVariables[i].Format == PARSER_STRING ? "\"" : "") );
+	  }
+
+
+	  WebOut += F("<hr></div><div style='float: right;'>Pin Stats");
+	  for (byte i = 0; i <= 15; i++)
+	  {
+		if ( i < 6 | i > 11) WebOut += String("<hr>" + String(i) + " = " + PinListOfStatus[i] + "  , " + String(PinListOfStatusValues[i]));
+	  }
+	  WebOut += "</div>";
+	}
+
+	server->send(200, F("text/html"), WebOut);
   });
-
+#endif
 
   server->on("/run", []()
   {
-    String WebOut;
-    RunningProgram = 1;
-    RunningProgramCurrentLine = 0;
-    WaitForTheInterpertersResponse = 0 ;
-    numberButtonInUse = 0;
-    HTMLout = "";
-    TimerWaitTime = 0;
-    GraphicsEliments[0][0] = 0;
-    WebOut = F(R"=====(  <meta http-equiv="refresh" content="0; url=./input?" />)=====");
-
-    clear_stacks();  
-    server->send(200, "text/html", WebOut);
+	clientTelnet.stop();
+	BasicDebuggingOn = 0;
+	telnetBranch = 0;
+	String WebOut;
+	RunningProgram = 1;
+	RunningProgramCurrentLine = 0;
+	WaitForTheInterpertersResponse = 0 ;
+	numberButtonInUse = 0;
+	HTMLout = "";
+	TimerWaitTime = 0;
+	TimerCBtime = 0;
+	GraphicsEliments[0][0] = 0;
+	WebOut = F(R"=====(  <meta http-equiv="refresh" content="0; url=./input?" />)=====");
+
+	clear_stacks();
+	server->send(200, F("text/html"), WebOut);
+  });
+
+  #if defined(BASIC_TFT)
+  server->on("/debug", []()
+  {
+	clientTelnet.stop();
+	BasicDebuggingOn = 1;
+	telnetBranch = 0;
+	String WebOut;
+	RunningProgramCurrentLine = 0;
+	WaitForTheInterpertersResponse = 0 ;
+	numberButtonInUse = 0;
+	HTMLout = "";
+	TimerWaitTime = 0;
+	TimerCBtime = 0;
+	GraphicsEliments[0][0] = 0;
+	WebOut = F(R"=====(  <meta http-equiv="refresh" content="0; url=./" />)=====");
+
+	clear_stacks();
+	server->send(200, F("text/html"), WebOut);
+
   });
+  #endif
+  
+  
 
+  server->on("/wsport.js", []()
+  {
+	server->send(200, F("text/html"), String("start('ws://' + location.hostname + ':" + LoadDataFromFile("wsport") + "/');"));
+  });
 
+  
+  
+  
+  
+#if defined(BASIC_TFT)
+  server->on("/graphics.htm", []()
+  {
+	server->send(200, F("text/html"), BasicGraphics());
+  });
+#endif
 
   server->onFileUpload(handleFileUpdate);
 
   server->on("/filemng", []()
   {
-    DoSomeFileManagerCode();
+	DoSomeFileManagerCode();
   });
-
+  
+  #if defined(BASIC_TFT)
+  server->on("/filmanws.js", []()
+  {
+	server->send(200, F("text/html"), FIleManWSJS);
+  });
+  #endif
 
   server->on("/edit", []()
   {
-    String WebOut;
-    if (CheckIfLoggedIn())
-    {
-      WebOut = String(LogInPage);
-      server->send(200, "text/html", String(AdminBarHTML + WebOut ));
-      return;
-    }
-    else
-    {
-      String CRLF = F("\r\n");
-      WaitForTheInterpertersResponse = 1;
-
-      String TextboxProgramBeingEdited;
-      //String ProgramName;
-      //WebOut = String("<form action='input'>" + HTMLout + "</form>");
-      WebOut = String(EditorPageHTML);
-
-      if ( server->arg("open") == F("Open") )
-      {
-        // really takes just the name for the new file otherwise it uses the previous one
-        ProgramName = GetRidOfurlCharacters(server->arg("name"));
-        
-        ProgramName.trim();
-        if (ProgramName == "")
-        {
-          ProgramName = F("/default.bas");
-        }
-        ProgramName  = MakeSureFileNameStartsWithSlash(ProgramName );
-        LoadBasicProgramFromFlash( ProgramName);
-      }
-      // the goal here is to replace the server send function by an equivalent that
-      // permit to handle big buffers; this is acheived using the "chunked transfer"
-      WebOut = String(EditorPageHTML);
-      WebOut = WebOut.substring(0, WebOut.indexOf(F("*program txt*")) );
-      WebOut.replace(F("*program name*"), ProgramName);
-
-      server->sendContent(F("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection:close\r\nTransfer-Encoding: chunked\r\nAccess-Control-Allow-Origin: *\r\n\r\n"));
-      delay(0);
-      Serial.println(F("start sending"));
-      // each "chunk" is composed of :
-      // the size of the block (in hex) terminated by \r\n
-      server->sendContent(String(String(AdminBarHTML).length(), 16) + CRLF);
-      // the block terminated by \r\n
-      server->sendContent(String(AdminBarHTML) + CRLF);
-      /////// end of first chunk ///////////
-      delay(0);
-      server->sendContent(String(WebOut.length(), 16) + CRLF);
-      server->sendContent(WebOut + CRLF);
-      delay(0);
-      int iii;
-      int i;
-      fileOpenFail = 0;
-      TextboxProgramBeingEdited = BasicProgram(1);
-      for (i = 2; (i < program_nb_lines); i++)
-      {
-        TextboxProgramBeingEdited = TextboxProgramBeingEdited + "\n" + BasicProgram(i);
-        
-        if (TextboxProgramBeingEdited.length() > 2048)
-        {
-          server->sendContent(String(TextboxProgramBeingEdited.length(), 16) + CRLF);
-          server->sendContent(TextboxProgramBeingEdited + CRLF);
-          TextboxProgramBeingEdited = "";
-          delay(0);
-        }
-      }
-      if (TextboxProgramBeingEdited.length() > 0)
-      {
-        server->sendContent(String(TextboxProgramBeingEdited.length(), 16) + CRLF);
-        server->sendContent(TextboxProgramBeingEdited + CRLF);
-        delay(0);
-      }
-
-      WebOut = String(EditorPageHTML);
-      WebOut = WebOut.substring(WebOut.indexOf(F("</textarea>")));
-      server->sendContent(String(WebOut.length(), 16) + CRLF);
-      server->sendContent(WebOut + CRLF);
-      // end of transmission
-      server->sendContent(F("0\r\n\r\n"));
-      server->sendContent(F("0\r\n\r\n"));
-      delay(0);
-      Serial.println(F("End of Open"));
-
-    }
+	WebGuiOff = 2;
+	String WebOut;
+	if (CheckIfLoggedIn())
+	{
+	  WebOut = String(LogInPage);
+	  server->send(200, F("text/html"), String(AdminBarHTML + WebOut ));
+	  WebGuiOff = 0;return;
+	}
+	else
+	{
+	  String CRLF = F("\r\n");
+	  WaitForTheInterpertersResponse = 1;
+
+	  String TextboxProgramBeingEdited;
+	  //String ProgramName;
+	  //WebOut = String("<form action='input'>" + HTMLout + "</form>");
+	  WebOut = String(EditorPageHTML);
+
+	  if ( server->arg("open") == F("Open") )
+	  {
+		// really takes just the name for the new file otherwise it uses the previous one
+		ProgramName = GetRidOfurlCharacters(server->arg("name"));
+
+		ProgramName.trim();
+		if (ProgramName == "")
+		{
+		  ProgramName = F("/default.bas");
+		}
+		ProgramName  = MakeSureFileNameStartsWithSlash(ProgramName );
+		LoadBasicProgramFromFlash( ProgramName);
+	  }
+	  // the goal here is to replace the server send function by an equivalent that
+	  // permit to handle big buffers; this is acheived using the "chunked transfer"
+	  WebOut = String(EditorPageHTML);
+	  WebOut = WebOut.substring(0, WebOut.indexOf(F("*program txt*")) );
+	  WebOut.replace(F("*program name*"), ProgramName);
+
+	  server->sendContent(F("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection:close\r\nTransfer-Encoding: chunked\r\nAccess-Control-Allow-Origin: *\r\n\r\n"));
+	  delay(0);
+	  Serial.println(F("start sending"));
+	  // each "chunk" is composed of :
+	  // the size of the block (in hex) terminated by \r\n
+	  server->sendContent(String(String(AdminBarHTML).length(), 16) + CRLF);
+	  // the block terminated by \r\n
+	  server->sendContent(String(AdminBarHTML) + CRLF);
+	  /////// end of first chunk ///////////
+	  delay(0);
+	  server->sendContent(String(WebOut.length(), 16) + CRLF);
+	  server->sendContent(WebOut + CRLF);
+	  delay(0);
+	  int iii;
+	  int i;
+	  fileOpenFail = 0;
+	  TextboxProgramBeingEdited = BasicProgram(1);
+	  for (i = 2; (i < program_nb_lines); i++)
+	  {
+		TextboxProgramBeingEdited = TextboxProgramBeingEdited + "\n" + BasicProgram(i);
+
+		if (TextboxProgramBeingEdited.length() > 2048)
+		{
+		  server->sendContent(String(TextboxProgramBeingEdited.length(), 16) + CRLF);
+		  server->sendContent(TextboxProgramBeingEdited + CRLF);
+		  TextboxProgramBeingEdited = "";
+		  delay(0);
+		}
+	  }
+	  if (TextboxProgramBeingEdited.length() > 0)
+	  {
+		server->sendContent(String(TextboxProgramBeingEdited.length(), 16) + CRLF);
+		server->sendContent(TextboxProgramBeingEdited + CRLF);
+		delay(0);
+	  }
+
+	  WebOut = String(EditorPageHTML);
+	  WebOut = WebOut.substring(WebOut.indexOf(F("</textarea>")));
+	  server->sendContent(String(WebOut.length(), 16) + CRLF);
+	  server->sendContent(WebOut + CRLF);
+	  // end of transmission
+	  server->sendContent(F("0\r\n\r\n"));
+	  server->sendContent(F("0\r\n\r\n"));
+	  delay(0);
+	  Serial.println(F("End of Open"));
+	  WebGuiOff = 0;
+	}
 
   });
 
 
 
   server->on("/editor.js", []() {
-    server->send(200, "text/html", editCodeJavaScript);
+	server->send(200, F("text/html"), editCodeJavaScript);
   });
 
-  
-  server->on("/filelist", []()
-  {
-    String ret = "";
-    String fn;
-    Dir dir = SPIFFS.openDir(String(F("/") ));
-    while (dir.next())
-    {
-      fn = dir.fileName();
-      if (fn.indexOf(F(".bas")) != -1)
-        ret +=  fn + "\n";
-      delay(0);
-    }
-
-
-    server->send(200, "text/html", ret);
-  });
 
-  server->on("/codein", []() {
-    //    ProgramName.trim();
-    //    if (ProgramName == "")
-    //    {
-    //      ProgramName = F("/default.bas");
-    //    }
-
-    if (server->arg("SaveTheCode") == F("start"))
-    {
-      inData = "end";
-      ExicuteTheCurrentLine();
-      Serial.println(F("start save"));
-      ProgramName = GetRidOfurlCharacters(server->arg("FileName"));
-      if (ProgramName == "")
-        ProgramName = F("/default.bas");
-      ProgramName.trim();
-      if (ProgramName[0] != '/')
-        ProgramName = "/" + ProgramName;
-      OpenToWriteOnFlash( ProgramName );
-    }
-
-    if (server->arg("SaveTheCode") != F("yes") & server->arg("SaveTheCode") != F("start") & server->arg("SaveTheCode") != F("end"))
-    {
-      String LineNoForWebEditorIn;
-      LineNoForWebEditorIn = server->arg("line");
-      int y = LineNoForWebEditorIn.toInt();
-      delay(0);
-      //Serial.println(server->arg("code"));
-      Serial.println(ProgramName + F("/") + String(y));
-      //BasicProgramWriteLine(y, GetRidOfurlCharacters(server->arg("code")));
-      WriteBasicLineOnFlash(GetRidOfurlCharacters(server->arg("code")));
-      delay(0);
-      noOfLinesForEdit = y;
-
-    }
-
-    if (server->arg("SaveTheCode") == F("end"))
-    {
-      // terminate the save
-      Serial.println(F("end of save!!"));
-      CloseWriteOnFlash();
-      LoadBasicProgramFromFlash( ProgramName );
-    }
-
-    if (server->arg("SaveTheCode") == F("yes"))
-    {
-
-      //      String directoryToDeleteFilesFrom;
-      //      directoryToDeleteFilesFrom = String(F(" /data/") + ProgramName;
-      //      Dir dir1 = SPIFFS.openDir(directoryToDeleteFilesFrom);
-      //
-      //      while (dir1.next())
-      //      {
-      //        delay(0);
-      //        File f = dir1.openFile("r");
-      //        if (dir1.fileName().substring(0, directoryToDeleteFilesFrom.length()) == directoryToDeleteFilesFrom) SPIFFS.remove(dir1.fileName());
-      //      }
-    }
-    server->send(200, "text/html", F("good"));
+
+  server->on("/WebSockets.js", []() {
+	server->send(200, F("text/html"), WebSocketsJS);
   });
 
 
 
+  server->on("/codein", []() {
+	//    ProgramName.trim();
+	//    if (ProgramName == "")
+	//    {
+	//      ProgramName = F("/default.bas");
+	//    }
+
+	if (server->arg("SaveTheCode") == F("start"))
+	{
+	  inData = "end";
+	  ExicuteTheCurrentLine();
+	  HaltBasic("");
+	  Serial.println(F("start save"));
+	  ProgramName = GetRidOfurlCharacters(server->arg("FileName"));
+	  if (ProgramName == "")ProgramName = F("/default.bas");
+	  ProgramName.trim();
+	  if (ProgramName[0] != '/') ProgramName = "/" + ProgramName;
+	  OpenToWriteOnFlash( ProgramName );
+	}
+
+	if (server->arg("SaveTheCode") != F("yes") & server->arg("SaveTheCode") != F("start") & server->arg("SaveTheCode") != F("end"))
+	{
+	  String LineNoForWebEditorIn;
+	  LineNoForWebEditorIn = server->arg("line");
+	  int y = LineNoForWebEditorIn.toInt();
+	  delay(0);
+	  //Serial.println(server->arg("code"));
+	  Serial.println(ProgramName + F("/") + String(y));
+	  //BasicProgramWriteLine(y, GetRidOfurlCharacters(server->arg("code")));
+	  WriteBasicLineOnFlash(GetRidOfurlCharacters(server->arg("code")));
+	  delay(0);
+	  noOfLinesForEdit = y;
+
+	} 
+
+	if (server->arg("SaveTheCode") == F("end"))
+	{
+	  // terminate the save
+	  Serial.println(F("end of save!!"));
+	  CloseWriteOnFlash();
+	  HaltBasic("");
+	  LoadBasicProgramFromFlash( ProgramName );
+	}
+
+	if (server->arg("SaveTheCode") == F("yes"))
+	{
+		HaltBasic("");
+	}
+	server->send(200, F("text/html"), F("good"));
+  });
 
 
-  server->on("/msg", []() {
 
-    MsgBranchRetrnData = F("No MSG Branch Defined");
 
-    if (msgbranch != "")
-    {
-      inData = String(" goto " + msgbranch + " ");
-      WaitForTheInterpertersResponse = 0;
-      ExicuteTheCurrentLine();
-      runTillWaitPart2();
-    }
 
+  server->on("/msg", []() {
 
-    server->send(200, "text/html", MsgBranchRetrnData);
+	MsgBranchRetrnData = F("No MSG Branch Defined");
+
+	if (msgbranch != 0)
+	{
+		byte oldWebGuiOff;
+		oldWebGuiOff = WebGuiOff;
+		Serial.println(msgbranch);
+		//WebGuiOff = 1;
+		RunningProgramCurrentLine = msgbranch;
+		WaitForTheInterpertersResponse = 0;
+		runTillWaitPart2();
+		WebGuiOff = oldWebGuiOff;
+	}
+
+	server->send(200, F("text/html"), MsgBranchRetrnData);
   });
 
 
@@ -706,50 +1157,61 @@ void setup() {
 
 
   server->on("/input", []() {
-    server->send(200, "text/html", RunningProgramGui());
+	server->send(200, F("text/html"), RunningProgramGui());
   });
 
   server->onNotFound ( []() {
-    String fileNameToServeUp;
-    fileNameToServeUp = GetRidOfurlCharacters(server->arg("file"));
-    File mySuperFile = SPIFFS.open(String(F("/uploads/")) + fileNameToServeUp, "r");
-    if (mySuperFile)
-    {
-      server->streamFile(mySuperFile, getContentType(fileNameToServeUp));
-      //server->send(200, getContentType(fileNameToServeUp), mySuperFile.readString());
-
-    }
-    else
-    {
-      server->send(200, "text/html", RunningProgramGui());
-    }
-    mySuperFile.close();
+	String fileNameToServeUp;
+	fileNameToServeUp = GetRidOfurlCharacters(server->arg("file"));
+	File mySuperFile = SPIFFS.open(String(F("/uploads/")) + fileNameToServeUp, "r");
+	if (mySuperFile)
+	{
+	  server->streamFile(mySuperFile, getContentType(fileNameToServeUp));
+	  //server->send(200, getContentType(fileNameToServeUp), mySuperFile.readString());
+
+	}
+	else
+	{
+	  server->send(200, F("text/html"), RunningProgramGui());
+	}
+	mySuperFile.close();
   });
 
   //LoadBasicProgramFromFlash("");
 
 
-  if (  ConnectToTheWIFI(LoadDataFromFile("WIFIname"), LoadDataFromFile("WIFIpass"), "", "", "") == 0)
+  if (  ConnectToTheWIFI(LoadDataFromFile("WIFIname"), LoadDataFromFile("WIFIpass"), LoadDataFromFile("ipaddress"), LoadDataFromFile("gateway"), LoadDataFromFile("subnetmask")) == 0)
   {
-    if (LoadDataFromFile("APname") == "")
-    {
-      CreateAP("", "");
-    }
-    else
-    {
-      CreateAP(LoadDataFromFile("APname"), LoadDataFromFile("APpass"));
-    }
+	if (LoadDataFromFile("APname") == "")
+	{
+	  CreateAP("", "", LoadDataFromFile("ipaddress"), LoadDataFromFile("gateway"), LoadDataFromFile("subnetmask"));
+	}
+	else
+	{
+	  CreateAP(LoadDataFromFile("APname"), LoadDataFromFile("APpass"), LoadDataFromFile("ipaddress"), LoadDataFromFile("gateway"), LoadDataFromFile("subnetmask"));
+	}
   }
 
 
   Wire.begin(0, 2);
 
   //  keyboard.begin(14, 12); //For PS2 keyboard input
-
+ #if defined(BASIC_TFT)
   StartUp_OLED();
+  display.init();
   lcd.begin(16, 2); // initialize the lcd for 16 chars 2 lines and turn on backlight
+#endif
   sensors.begin();
 
+  if (!SPIFFS.exists(ProgramName))
+  {
+	OpenToWriteOnFlash(ProgramName);
+	delay(0);
+	WriteBasicLineOnFlash("  ");
+	CloseWriteOnFlash();
+  }
+  
+  
   LoadBasicProgramFromFlash( ProgramName);
 
   server->begin();
@@ -757,6 +1219,10 @@ void setup() {
   WaitForTheInterpertersResponse = 1;
   StartUpProgramTimer();
   InitCommandParser(); // init the commands parser
+
+  // start webSocket server
+  webSocket->begin();
+  webSocket->onEvent(webSocketEvent);
 }
 
 
@@ -764,120 +1230,140 @@ String SettingsPageHandeler()
 {
   if ( server->arg("key") == LoadDataFromFile("LoginKey"))
   {
-    LoggedIn = millis();
+	LoggedIn = millis();
   }
 
 
   WaitForTheInterpertersResponse = 1;
   String WebOut = String(AdminBarHTML) + String(SettingsPageHTML);
-  String staName = LoadDataFromFile("WIFIname");
-  String staPass = LoadDataFromFile("WIFIpass");
-  String apName = LoadDataFromFile("APname");
-  String apPass = LoadDataFromFile("APpass");
-  String LoginKey = LoadDataFromFile("LoginKey");
-  String ShowMenueBar = LoadDataFromFile("ShowMenueBar");
-  String otaUrl = LoadDataFromFile("otaUrl");
-  String autorun = LoadDataFromFile("autorun");
-  String listenport = LoadDataFromFile("listenport");
+  String staName = LoadDataFromFile(F("WIFIname"));
+  String staPass = LoadDataFromFile(F("WIFIpass"));
+  String apName = LoadDataFromFile(F("APname"));
+  String apPass = LoadDataFromFile(F("APpass"));
+  String LoginKey = LoadDataFromFile(F("LoginKey"));
+  String ShowMenueBar = LoadDataFromFile(F("ShowMenueBar")); 
+  String otaUrl = LoadDataFromFile(F("otaUrl"));
+  String autorun = LoadDataFromFile(F("autorun"));
+  String listenport = LoadDataFromFile(F("listenport"));
+  String wsport = LoadDataFromFile(F("wsport"));
+  String ipaddress = LoadDataFromFile(F("ipaddress"));
+  String subnetmask = LoadDataFromFile(F("subnetmask"));
+  String gateway = LoadDataFromFile(F("gateway"));
+  
+  
+  
 
   // listening port - by default goes to 80 -
   if (listenport.toInt() == 0)
-    listenport = F("80");
-    
+	listenport = F("80");
+
   //Serial.print("Loading Settings Files");
 
   if (millis() > LoggedIn + 600000 || LoggedIn == 0 )
   {
-    WebOut = LogInPage;
+	WebOut = LogInPage;
   }
   else
   {
 
-    if ( server->arg("restart") == F("Restart") ) ESP.restart();
-
-
-    if ( server->arg("update") == F("Update") )
-    {
-
-      //        Serial.println(BasicOTAupgrade());
-      if (LoadDataFromFile("otaUrl") == "")
-      {
-        t_httpUpdate_return  ret = ESPhttpUpdate.update(F("esp8266basic.smbisoft.com"), 80, F("/4M/ESP8266Basic.cpp.bin"));
-        if (ret == HTTP_UPDATE_FAILED ) Serial.println(F("Update failed"));
-      }
-      else
-      {
-        String URLtoGet = LoadDataFromFile("otaUrl");
-        String ServerToConnectTo;
-        String PageToGet;
-        ServerToConnectTo = URLtoGet.substring(0, URLtoGet.indexOf("/"));
-        PageToGet = URLtoGet.substring(URLtoGet.indexOf("/"));
-        t_httpUpdate_return  ret = ESPhttpUpdate.update(ServerToConnectTo, 80, PageToGet);
-        if (ret == HTTP_UPDATE_FAILED ) Serial.println(F("Update failed"));
-      }
-      //t_httpUpdate_return  ret = ESPhttpUpdate.update("cdn.rawgit.com", 80, "/esp8266/Basic/master/Flasher/Build/4M/ESP8266Basic.cpp.bin");
-
-    }
-
-
-    if ( server->arg("save") == F("Save") )
-    {
-      staName      = GetRidOfurlCharacters(server->arg("staName"));
-      staPass      = GetRidOfurlCharacters(server->arg("staPass"));
-      apName       = GetRidOfurlCharacters(server->arg("apName"));
-      apPass       = GetRidOfurlCharacters(server->arg("apPass"));
-      LoginKey     = GetRidOfurlCharacters(server->arg("LoginKey"));
-      ShowMenueBar = GetRidOfurlCharacters(server->arg("showMenueBar"));
-      otaUrl       = GetRidOfurlCharacters(server->arg("otaurl"));
-      autorun      = GetRidOfurlCharacters(server->arg("autorun"));
-      listenport   = GetRidOfurlCharacters(server->arg("listenport"));
-      
-      SaveDataToFile("WIFIname" , staName);
-      SaveDataToFile("WIFIpass" , staPass);
-      SaveDataToFile("APname" , apName);
-      SaveDataToFile("APpass" , apPass);
-      SaveDataToFile("LoginKey" , LoginKey);
-      SaveDataToFile("ShowMenueBar" , ShowMenueBar);
-      SaveDataToFile("otaUrl" , otaUrl);
-      SaveDataToFile("autorun" , autorun);
-      SaveDataToFile("listenport" , listenport);
-      
-    }
-
-    if ( server->arg("format") == F("Format") )
-    {
-      // BasicFileOpened.close();
-      Serial.println(F("Formating "));
-      Serial.print(SPIFFS.format());
-    }
-
-    WebOut.replace(F("*sta name*"), staName);
-    WebOut.replace(F("*sta pass*"), staPass);
-    WebOut.replace(F("*ap name*"),  apName);
-    WebOut.replace(F("*ap pass*"),  apPass);
-    WebOut.replace(F("*LoginKey*"), LoginKey);
-    WebOut.replace(F("*BasicVersion*"), BasicVersion);
-    WebOut.replace(F("*otaurl*"), otaUrl);
-    WebOut.replace(F("*listenport*"), listenport);
-    
-    if ( ShowMenueBar == F("off"))
-    {
-      WebOut.replace(F("**checked**"), F("checked"));
-    }
-    else
-    {
-      WebOut.replace(F("**checked**"), "");
-    }
-
-    if ( autorun == F("on"))
-    {
-      WebOut.replace(F("**autorun**"), F("checked"));
-    }
-    else
-    {
-      WebOut.replace(F("**autorun**"), "");
-    }
-    
+	if ( server->arg("restart") == F("Restart") ) ESP.restart();
+
+    #if defined(BASIC_TFT)
+	if ( server->arg("update") == F("Update") )
+	{
+
+	  //        Serial.println(BasicOTAupgrade());
+	  if (LoadDataFromFile("otaUrl") == "")
+	  {
+		t_httpUpdate_return  ret = ESPhttpUpdate.update(F("esp8266basic.smbisoft.com"), 80, F("/4M/ESP8266Basic.cpp.bin"));
+		if (ret == HTTP_UPDATE_FAILED ) Serial.println(F("Update failed"));
+	  }
+	  else
+	  {
+		String URLtoGet = LoadDataFromFile("otaUrl");
+		String ServerToConnectTo;
+		String PageToGet;
+		ServerToConnectTo = URLtoGet.substring(0, URLtoGet.indexOf("/"));
+		PageToGet = URLtoGet.substring(URLtoGet.indexOf("/"));
+		t_httpUpdate_return  ret = ESPhttpUpdate.update(ServerToConnectTo, 80, PageToGet);
+		if (ret == HTTP_UPDATE_FAILED ) Serial.println(F("Update failed"));
+	  }
+	  //t_httpUpdate_return  ret = ESPhttpUpdate.update("cdn.rawgit.com", 80, "/esp8266/Basic/master/Flasher/Build/4M/ESP8266Basic.cpp.bin");
+
+	}
+    #endif
+
+	if ( server->arg("save") == F("Save") )
+	{
+	  staName      = GetRidOfurlCharacters(server->arg("staName"));
+	  staPass      = GetRidOfurlCharacters(server->arg("staPass"));
+	  apName       = GetRidOfurlCharacters(server->arg("apName"));
+	  apPass       = GetRidOfurlCharacters(server->arg("apPass"));
+	  LoginKey     = GetRidOfurlCharacters(server->arg("LoginKey"));
+	  ShowMenueBar = GetRidOfurlCharacters(server->arg("showMenueBar"));
+	  otaUrl       = GetRidOfurlCharacters(server->arg("otaurl"));
+	  autorun      = GetRidOfurlCharacters(server->arg("autorun"));
+	  ipaddress   = GetRidOfurlCharacters(server->arg("ipaddress"));
+	  subnetmask   = GetRidOfurlCharacters(server->arg("subnetmask"));
+	  gateway   = GetRidOfurlCharacters(server->arg("gateway"));
+	  listenport   = GetRidOfurlCharacters(server->arg("listenport"));
+	  wsport   = GetRidOfurlCharacters(server->arg("wsport"));
+
+	  SaveDataToFile("WIFIname" , staName);
+	  SaveDataToFile("WIFIpass" , staPass);
+	  SaveDataToFile("APname" , apName);
+	  SaveDataToFile("APpass" , apPass);
+	  SaveDataToFile("LoginKey" , LoginKey);
+	  SaveDataToFile("ShowMenueBar" , ShowMenueBar);
+	  SaveDataToFile("otaUrl" , otaUrl);
+	  SaveDataToFile("autorun" , autorun);
+	  SaveDataToFile("ipaddress" , ipaddress);
+	  SaveDataToFile("subnetmask" , subnetmask);
+	  SaveDataToFile("gateway" , gateway);
+	  SaveDataToFile("listenport" , listenport);
+	  SaveDataToFile("wsport" , wsport);
+
+	}
+
+	if ( server->arg("format") == F("Format") )
+	{
+	  // BasicFileOpened.close();
+	  Serial.println(F("Formating "));
+	  Serial.print(SPIFFS.format());
+	}
+
+	WebOut.replace(F("*sta name*"), staName);
+	WebOut.replace(F("*sta pass*"), staPass);
+	WebOut.replace(F("*ap name*"),  apName);
+	WebOut.replace(F("*ap pass*"),  apPass);
+	WebOut.replace(F("*LoginKey*"), LoginKey);
+	WebOut.replace(F("*BasicVersion*"), BasicVersion);
+	WebOut.replace(F("*otaurl*"), otaUrl);
+
+	WebOut.replace(F("*ipaddress*"), ipaddress);
+	WebOut.replace(F("*subnetmask*"), subnetmask);
+	WebOut.replace(F("*gateway*"), gateway);    
+	WebOut.replace(F("*listenport*"), listenport);
+	WebOut.replace(F("*wsport*"), wsport);
+
+	if ( ShowMenueBar == F("off"))
+	{
+	  WebOut.replace(F("**checked**"), F("checked"));
+	}
+	else
+	{
+	  WebOut.replace(F("**checked**"), "");
+	}
+
+	if ( autorun == F("on"))
+	{
+	  WebOut.replace(F("**autorun**"), F("checked"));
+	}
+	else
+	{
+	  WebOut.replace(F("**autorun**"), "");
+	}
+
   }
   return WebOut;
 }
@@ -885,35 +1371,44 @@ String SettingsPageHandeler()
 
 
 String getContentType(String filename) {
-  if (filename.endsWith(".htm")) return F("text/html");
+  String ret = F("text/plain");
+  if (filename.endsWith(".gz"))
+  {
+	ret = F("application/x-gzip");
+	filename = filename.substring(0, filename.length()-3);
+	Serial.println("getcontenttype " + filename);
+  }
+  
+	   if (filename.endsWith(".htm"))  return F("text/html");
   else if (filename.endsWith(".html")) return F("text/html");
-  else if (filename.endsWith(".htm")) return F("text/html");
-  else if (filename.endsWith(".css")) return F("text/css");
-  else if (filename.endsWith(".js")) return F("application/javascript");
-  else if (filename.endsWith(".png")) return F("image/png");
-  else if (filename.endsWith(".gif")) return F("image/gif");
-  else if (filename.endsWith(".jpg")) return F("image/jpeg");
-  else if (filename.endsWith(".ico")) return F("image/x-icon");
-  else if (filename.endsWith(".xml")) return F("text/xml");
-  else if (filename.endsWith(".pdf")) return F("application/x-pdf");
-  else if (filename.endsWith(".zip")) return F("application/x-zip");
-  else if (filename.endsWith(".gz")) return F("application/x-gzip");
-  return "text/plain";
+  else if (filename.endsWith(".css"))  return F("text/css");
+  else if (filename.endsWith(".js"))   return F("application/javascript");
+  else if (filename.endsWith(".png"))  return F("image/png");
+  else if (filename.endsWith(".gif"))  return F("image/gif");
+  else if (filename.endsWith(".jpg"))  return F("image/jpeg");
+  else if (filename.endsWith(".ico"))  return F("image/x-icon");
+  else if (filename.endsWith(".xml"))  return F("text/xml");
+  else if (filename.endsWith(".pdf"))  return F("application/x-pdf");
+  else if (filename.endsWith(".zip"))  return F("application/x-zip");
+  else if (filename.endsWith(".gz"))   return F("application/x-gzip");
+  return ret;
 }
 
 void StartUpProgramTimer()
 {
+  int Startuptimer  = LoadDataFromFile("starttimer").toInt();
+  if (Startuptimer == 0) Startuptimer = 30;
   pinMode(0, INPUT_PULLUP);  // set GPIO0 to input with pullup; so if float should read 1, 0 on ground
-  while  (millis() < 30000)
+  while  (millis() < Startuptimer * 1000)
   {
-    delay(0);
-    //Serial.println(millis());
-    server->handleClient();
-    if (WaitForTheInterpertersResponse == 0) return;
-
-    // MOD cicciocb April 2016
-    // if the pin GPIO0 is taken to GND, the program will not start
-    if (digitalRead(0) == 0)  return; // if the pin GPIO0 is at GND , stop the autorun
+	delay(0);
+	//Serial.println(millis());
+	server->handleClient();
+	if (WaitForTheInterpertersResponse == 0) return;
+
+	// MOD cicciocb April 2016
+	// if the pin GPIO0 is taken to GND, the program will not start
+	if (digitalRead(0) == 0)  return; // if the pin GPIO0 is at GND , stop the autorun
   }
   if (LoadDataFromFile("autorun") != "on")  return; // if the autorun option is disabled, returns
   Serial.println(F("Starting Default Program"));
@@ -923,7 +1418,7 @@ void StartUpProgramTimer()
   numberButtonInUse = 0;
   HTMLout = "";
 
-  clear_stacks(); 
+  clear_stacks();
   return;
 }
 
@@ -936,65 +1431,65 @@ void DoSomeFileManagerCode()
 
   if (CheckIfLoggedIn())
   {
-    WholeUploadPage = LogInPage;
+	WholeUploadPage = LogInPage;
   }
   else
   {
-    if (server->arg("Delete") != "")
-    {
-      String FIleNameForDelete = server->arg("fileName");
-      FIleNameForDelete = GetRidOfurlCharacters(FIleNameForDelete);
-      Serial.println(FIleNameForDelete);
-      Serial.println(SPIFFS.remove(FIleNameForDelete));
-      //Serial.println(SPIFFS.remove("uploads/settings.png"));
-    }
-
-    Dir dir = SPIFFS.openDir(String(F("/") ));
-    while (dir.next()) {
-      FileListForPage += String(F("<option>")) + dir.fileName() + String(F("</option>"));
-      delay(0);
-    }
-
-    WholeUploadPage.replace("*table*", FileListForPage);
-
-    if (server->arg("View") != "")
-    {
-      String FileNameToView = server->arg("fileName");
-      FileNameToView = GetRidOfurlCharacters(FileNameToView);
-      FileNameToView.replace("/uploads/", "");
-      WholeUploadPage = F(R"=====(  <meta http-equiv="refresh" content="0; url=./file?file=item" />)=====");
-      WholeUploadPage.replace("item", FileNameToView);
-    }
-
-
-    if (server->arg("Edit") != "")
-    {
-      String FileNameToView = server->arg("fileName");
-      FileNameToView = GetRidOfurlCharacters(FileNameToView);
-      //FileNameToView.replace("/uploads/", "");
-      WholeUploadPage = F(R"=====(  <meta http-equiv="refresh" content="1; url=./edit?name=item&open=Open" />)=====");
-      WholeUploadPage.replace("item", FileNameToView);
-    }
-
-    if (server->arg("Rename") != "")
-    {
-      String FileNameToView = server->arg("fileName");
-      FileNameToView = GetRidOfurlCharacters(FileNameToView);
-      String newfileName = server->arg("newfileName");
-      newfileName  = GetRidOfurlCharacters(newfileName );
-      WholeUploadPage = F(R"=====(<form id="filelist">Old Name<br><input type="text" name="fileName" value="*item name*"><br>New Name<br><input type="text" name="newfileName" value="*item name*"><input type="submit" value="NewName" name="Rename"></form>)=====");
-      WholeUploadPage.replace("*item name*", FileNameToView);
-      if (newfileName != "" )
-      {
-        newfileName = MakeSureFileNameStartsWithSlash(newfileName);
-        WholeUploadPage = F(R"=====(  <meta http-equiv="refresh" content="0; url=./filemng" />)=====");
-        SPIFFS.rename(FileNameToView , newfileName);
-      }
-    }
-
-
+	if (server->arg("Delete") != "")
+	{
+	  String FIleNameForDelete = server->arg("fileName");
+	  FIleNameForDelete = GetRidOfurlCharacters(FIleNameForDelete);
+	  Serial.println(FIleNameForDelete);
+	  Serial.println(SPIFFS.remove(FIleNameForDelete));
+	  //Serial.println(SPIFFS.remove("uploads/settings.png"));
+	}
+
+#if !defined(BASIC_TFT)
+	Dir dir = SPIFFS.openDir(String(F("/") ));
+	while (dir.next()) {
+	  FileListForPage += String(F("<option>")) + dir.fileName() + String(F("</option>"));
+	  delay(0);
+	}
+
+	WholeUploadPage.replace("*table*", FileListForPage);
+#endif
+
+	if (server->arg("View") != "")
+	{
+	  String FileNameToView = server->arg("fileName");
+	  FileNameToView = GetRidOfurlCharacters(FileNameToView);
+	  FileNameToView.replace("/uploads/", "");
+	  WholeUploadPage = F(R"=====(  <meta http-equiv="refresh" content="0; url=./file?file=item" />)=====");
+	  WholeUploadPage.replace("item", FileNameToView);
+	}
+
+
+	if (server->arg("Edit") != "")
+	{
+	  String FileNameToView = server->arg("fileName");
+	  FileNameToView = GetRidOfurlCharacters(FileNameToView);
+	  //FileNameToView.replace("/uploads/", "");
+	  WholeUploadPage = F(R"=====(  <meta http-equiv="refresh" content="1; url=./edit?name=item&open=Open" />)=====");
+	  WholeUploadPage.replace("item", FileNameToView);
+	}
+
+	if (server->arg("Rename") != "")
+	{
+	  String FileNameToView = server->arg("fileName");
+	  FileNameToView = GetRidOfurlCharacters(FileNameToView);
+	  String newfileName = server->arg("newfileName");
+	  newfileName  = GetRidOfurlCharacters(newfileName );
+	  WholeUploadPage = F(R"=====(<form id="filelist">Old Name<br><input type="text" name="fileName" value="*item name*"><br>New Name<br><input type="text" name="newfileName" value="*item name*"><input type="submit" value="NewName" name="Rename"></form>)=====");
+	  WholeUploadPage.replace("*item name*", FileNameToView);
+	  if (newfileName != "" )
+	  {
+		newfileName = MakeSureFileNameStartsWithSlash(newfileName);
+		WholeUploadPage = F(R"=====(  <meta http-equiv="refresh" content="0; url=./filemng" />)=====");
+		SPIFFS.rename(FileNameToView , newfileName);
+	  }
+	}
   }
-  server->send(200, "text/html",  String( AdminBarHTML + WholeUploadPage ));
+  server->send(200, F("text/html"),  String( AdminBarHTML + WholeUploadPage ));
 }
 
 
@@ -1004,18 +1499,18 @@ void handleFileUpdate()
   //if (server->uri() != "/edit") return;
   HTTPUpload& upload = server->upload();
   if (upload.status == UPLOAD_FILE_START) {
-    String filename = upload.filename;
-    //DBG_OUTPUT_PORT.print("Upload Name: "); DBG_OUTPUT_PORT.println(filename);
-    fsUploadFile = SPIFFS.open(String("/uploads/" + filename), "w");
-    filename = String();
+	String filename = upload.filename;
+	//DBG_OUTPUT_PORT.print("Upload Name: "); DBG_OUTPUT_PORT.println(filename);
+	fsUploadFile = SPIFFS.open(String("/uploads/" + filename), "w");
+	filename = String();
   } else if (upload.status == UPLOAD_FILE_WRITE) {
-    //DBG_OUTPUT_PORT.print("Upload Data: "); DBG_OUTPUT_PORT.println(upload.currentSize);
-    if (fsUploadFile)
-      fsUploadFile.write(upload.buf, upload.currentSize);
+	//DBG_OUTPUT_PORT.print("Upload Data: "); DBG_OUTPUT_PORT.println(upload.currentSize);
+	if (fsUploadFile)
+	  fsUploadFile.write(upload.buf, upload.currentSize);
   } else if (upload.status == UPLOAD_FILE_END) {
-    if (fsUploadFile)
-      fsUploadFile.close();
-    //DBG_OUTPUT_PORT.print("Upload Size: "); DBG_OUTPUT_PORT.println(upload.totalSize);
+	if (fsUploadFile)
+	  fsUploadFile.close();
+	//DBG_OUTPUT_PORT.print("Upload Size: "); DBG_OUTPUT_PORT.println(upload.totalSize);
   }
 }
 
@@ -1035,20 +1530,20 @@ String  getSerialInput()
   String someInput;
   while (donereceivinginfo == 0)
   {
-    if (serialTimeOutStart + SerialTimeOut < millis() & SerialTimeOut != 0) return someInput;
-    delay(0);
-    while (Serial.available() > 0)
-    {
-      char recieved = Serial.read();
-      // Process message when new line character is recieved
-      if (recieved == '\n')
-      {
-        Serial.println(someInput);
-        donereceivinginfo = 1;
-        return someInput;
-      }
-      someInput += recieved;
-    }
+	if (serialTimeOutStart + SerialTimeOut < millis() & SerialTimeOut != 0) return someInput;
+	delay(0);
+	while (Serial.available() > 0)
+	{
+	  char recieved = Serial.read();
+	  // Process message when new line character is recieved
+	  if (recieved == '\n')
+	  {
+		Serial.println(someInput);
+		donereceivinginfo = 1;
+		return someInput;
+	  }
+	  someInput += recieved;
+	}
   }
 }
 
@@ -1111,7 +1606,7 @@ bool CheckIfLoggedIn()
 {
   if (LoadDataFromFile("LoginKey") != "")
   {
-    if ( millis() > LoggedIn + 600000 || LoggedIn == 0 )     return 1;
+	if ( millis() > LoggedIn + 600000 || LoggedIn == 0 )     return 1;
   }
   return 0;
 }
@@ -1130,68 +1625,119 @@ void loop()
 
   RunBasicTillWait();
   delay(0);
-  server->handleClient();
+  if (delaytime == 0)server->handleClient();
+  webSocket->loop();
+  
+  if (MQTTActivated)
+  { 
+	  if (!MQTTclient.connected()) {
+	  	MQTTreconnect();
+	  }
+	  MQTTclient.loop();
+	  //Serial.println("Checking mqtt");
+	  //MQTTclient.loop();
+	  if (MQTTnewMsgReceived == 1 & MQTTBranch != "")
+	  {     
+			MQTTnewMsgReceived = 0;
+		    inData = String(" goto " + MQTTBranch + " ");
+			WaitForTheInterpertersResponse = 0;
+			ExicuteTheCurrentLine();
+			runTillWaitPart2();
+	  } 
+  }
+  
+  
+  
 }
 
 
 
 void RunBasicTillWait()
 {
+  webSocket->loop();
+  if (delaytime > millis() && delaytime != 0) {return;} else {delaytime = 0;}
   runTillWaitPart2();
   if (RunningProgramCurrentLine > TotalNumberOfLines)
   {
-    RunningProgram = 0 ;
-    TimerWaitTime = 0;
-    return;
+	inData = String(" end");
+	WaitForTheInterpertersResponse = 0;
+	ExicuteTheCurrentLine();
+	return;
   }
 
-  if (TimerWaitTime + timerLastActiveTime <= millis() &  TimerWaitTime != 0)
+
+
+  
+  
+  if (TimerWaitTime + timerLastActiveTime <= millis() &&  TimerWaitTime != 0  & WaitForTheInterpertersResponse )
+  {
+	inData = String(" goto " + TimerBranch + " ");
+	WaitForTheInterpertersResponse = 0;
+	timerLastActiveTime = millis() ;
+	ExicuteTheCurrentLine();
+	runTillWaitPart2();
+  }
+  if (telnetBranch != 0 &&  clientTelnet.available())
   {
-    inData = String(" goto " + TimerBranch + " ");
-    WaitForTheInterpertersResponse = 0;
-    timerLastActiveTime = millis() ;
-    ExicuteTheCurrentLine();
-    runTillWaitPart2();
+	RunningProgramCurrentLine = telnetBranch;
+	WaitForTheInterpertersResponse = 0;
+	runTillWaitPart2();
   }
+
+  
+  
+  
+  
   delay(0);
   for (int pinnn = 0; pinnn <= 15 ; pinnn++)
   {
-    delay(0);
-    //Serial.println(pinnn);
-    if ((PinListOfStatus[pinnn] != "po") & ( PinListOfStatus[pinnn] != "pi") & (PinListOfStatus[pinnn] != "pwi") & (PinListOfStatus[pinnn] != "pwo") & (PinListOfStatus[pinnn] != "servo") & ( PinListOfStatus[pinnn] != ""))
-    {
-      //Serial.println("Foud interupt pin");
-      if ( PinListOfStatusValues[pinnn] != UniversalPinIO("pi", String(pinnn), 0))
-      {
-        inData = String(" goto " + PinListOfStatus[pinnn] + " ");
-        WaitForTheInterpertersResponse = 0;
-        //Serial.println(PinListOfStatus[pinnn]);
-        ExicuteTheCurrentLine();
-        runTillWaitPart2();
-      }
-    }
+	delay(0);
+	//Serial.println(pinnn);
+	if ((PinListOfStatus[pinnn] != "po") & ( PinListOfStatus[pinnn] != "pi") & (PinListOfStatus[pinnn] != "pwi") & (PinListOfStatus[pinnn] != "pwo") & (PinListOfStatus[pinnn] != "servo") & ( PinListOfStatus[pinnn] != ""))
+	{
+	  //Serial.println("Foud interupt pin");
+	  if ( PinListOfStatusValues[pinnn] != UniversalPinIO("pi", String(pinnn), 0))
+	  {
+		inData = String(" goto " + PinListOfStatus[pinnn] + " ");
+		WaitForTheInterpertersResponse = 0;
+		//Serial.println(PinListOfStatus[pinnn]);
+		ExicuteTheCurrentLine();
+		runTillWaitPart2();
+	  }
+	}
   }
 }
 
 
 void runTillWaitPart2()
 {
-  while (RunningProgram == 1 && RunningProgramCurrentLine < TotalNumberOfLines && WaitForTheInterpertersResponse == 0 )
+  
+  if (NewGuiItemAddedSinceLastWait) WebSocketSend(  "guicls");NewGuiItemAddedSinceLastWait = 0;
+  if (NewGraphicItemAddedSinceLastWait) WebSocketSend("gupdate");NewGraphicItemAddedSinceLastWait = 0;
+
+  //Serial.println("Delay time" + String(delaytime));
+  //Serial.println("CUrent Line" + String(RunningProgramCurrentLine));
+  //Serial.println("Wait = " + String(WaitForTheInterpertersResponse));
+  while (RunningProgram == 1 && RunningProgramCurrentLine < TotalNumberOfLines && WaitForTheInterpertersResponse == 0 && delaytime == 0)
   {
-    delay(0);
-    RunningProgramCurrentLine++;
-    inData = BasicProgram(RunningProgramCurrentLine);
-    inData = StripCommentsFromLine(inData);
-    if (fileOpenFail == 1) inData  = "end";
-    ExicuteTheCurrentLine();
-    delay(0);
-    CheckForUdpData();
+	//Serial.println(inData);
+
+	delay(0);
+	RunningProgramCurrentLine++;
+	inData = BasicProgram(RunningProgramCurrentLine);
+	inData = StripCommentsFromLine(inData);
+	if (fileOpenFail == 1) inData  = "end";
+	ExicuteTheCurrentLine();
+	delay(0);
+	CheckForUdpData();
+	webSocket->loop();
   }
   if (RunningProgram == 1 && RunningProgramCurrentLine < TotalNumberOfLines && WaitForTheInterpertersResponse == 1 )
   {
-    //Serial.print("sto in wait ");
-    //Serial.println(RunningProgramCurrentLine);
-    CheckForUdpData();
+	//Serial.print("sto in wait ");
+	//Serial.println(RunningProgramCurrentLine);
+	CheckForUdpData();
+	webSocket->loop();
   }
 
 
@@ -1208,14 +1754,14 @@ String StripCommentsFromLine(String ret)
   bool quotes = false;
   for (int i = 0; i < ret.length(); i++)
   {
-    if (ret[i] == '"')
-      quotes = !quotes;
-
-    if ( (ret[i] == '\'') && (quotes == false) )
-    {
-      ret = ret.substring(0, i);  // cut the line at the current position (removes all the comments from the line
-      break;
-    }
+	if (ret[i] == '"')
+	  quotes = !quotes;
+
+	if ( (ret[i] == '\'') && (quotes == false) )
+	{
+	  ret = ret.substring(0, i);  // cut the line at the current position (removes all the comments from the line
+	  break;
+	}
   }
   return ret;
 }
@@ -1225,90 +1771,136 @@ void CheckForUdpData()
   int numBytes = udp.parsePacket();
   if ( numBytes)
   {
-    //    Serial.print("Packet received ");
-    //    Serial.print(RunningProgramCurrentLine);
-    //    Serial.print("  ");
-    //    Serial.println(udp.available());
-
-    if (numBytes > 0)
-    {
-      char Buffer[numBytes + 1];
-      UdpRemoteIP = udp.remoteIP();
-      UdpRemotePort = udp.remotePort();
-      delay(0);
-      udp.read(Buffer, numBytes);
-      Buffer[numBytes] = '\0'; // terminate the string with '\0'
-      UdpBuffer = String(Buffer);
-    }
-
-    //// test of gosub ///////
-    if (UdpBranchLine > 0)
-    {
-      // if the program is in wait, it returns to the previous line to wait again
-      return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
-      WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
-      RunningProgramCurrentLine = UdpBranchLine + 1; // gosub after the udpbranch label
-      UdpBranchLine = - UdpBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
-    }
+	//    Serial.print("Packet received ");
+	//    Serial.print(RunningProgramCurrentLine);
+	//    Serial.print("  ");
+	//    Serial.println(udp.available());
+
+	if (numBytes > 0)
+	{
+	  char Buffer[numBytes + 1];
+	  UdpRemoteIP = udp.remoteIP();
+	  UdpRemotePort = udp.remotePort();
+	  delay(0);
+	  udp.read(Buffer, numBytes);
+	  Buffer[numBytes] = '\0'; // terminate the string with '\0'
+	  UdpBuffer = String(Buffer);
+	}
+
+	//// test of gosub ///////
+	if (UdpBranchLine > 0)
+	{
+	  // if the program is in wait, it returns to the previous line to wait again
+	  return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+	  WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+	  RunningProgramCurrentLine = UdpBranchLine + 1; // gosub after the udpbranch label
+	  UdpBranchLine = - UdpBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
+	}
   }
-  //// 
+  ////
   if (Serial.available() > 0)
   {
-    delay(50); // insure that the data can be received
-    //// put like a gosub ///////
-    if (SerialBranchLine > 0)
-    {
-      // if the program is in wait, it returns to the previous line to wait again
-      return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
-      WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
-      RunningProgramCurrentLine = SerialBranchLine + 1; // gosub after the SerialBranch label
-      SerialBranchLine = - SerialBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
-    }
+	delay(50); // insure that the data can be received
+	//// put like a gosub ///////
+	if (SerialBranchLine > 0)
+	{
+	  // if the program is in wait, it returns to the previous line to wait again
+	  return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+	  WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+	  RunningProgramCurrentLine = SerialBranchLine + 1; // gosub after the SerialBranch label
+	  SerialBranchLine = - SerialBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
+	}
   }
   if ((swSer != NULL))
   {
-    if (swSer->available() > 0)
-    {
-      delay(50); // insure that the data can be received
-      //// put like a gosub ///////
-      if (Serial2BranchLine > 0)
-      {
-        // if the program is in wait, it returns to the previous line to wait again
-        return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
-        WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
-        RunningProgramCurrentLine = Serial2BranchLine + 1; // gosub after the SerialBranch label
-        Serial2BranchLine = - Serial2BranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
-      }
-    }  
+	if (swSer->available() > 0)
+	{
+	  delay(50); // insure that the data can be received
+	  //// put like a gosub ///////
+	  if (Serial2BranchLine > 0)
+	  {
+		// if the program is in wait, it returns to the previous line to wait again
+		return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+		WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+		RunningProgramCurrentLine = Serial2BranchLine + 1; // gosub after the SerialBranch label
+		Serial2BranchLine = - Serial2BranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
+	  }
+	}
   }
   if (irrecv->decode(&IRresults)) {
-    //Serial.println(IRresults.value, HEX);
-    //dump(&IRresults);
-    //irrecv->resume(); // Receive the next value
-    if (IRBranchLine > 0)
-    {
-      // if the program is in wait, it returns to the previous line to wait again
-      return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
-      WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
-      RunningProgramCurrentLine = IRBranchLine + 1; // gosub after the IRBranch label
-      IRBranchLine = - IRBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command    
-    }
+	//Serial.println(IRresults.value, HEX);
+	//dump(&IRresults);
+	//irrecv->resume(); // Receive the next value
+	if (IRBranchLine > 0)
+	{
+	  // if the program is in wait, it returns to the previous line to wait again
+	  return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+	  WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+	  RunningProgramCurrentLine = IRBranchLine + 1; // gosub after the IRBranch label
+	  IRBranchLine = - IRBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
+	}
+  }
+  if (TimerCBtime > 0)
+  {
+	if (millis() > (timercbLastActiveTime + TimerCBtime) )
+	{
+	  timercbLastActiveTime = millis();
+	  // if the program is in wait, it returns to the previous line to wait again
+	  return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+	  WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+	  RunningProgramCurrentLine = TimerCBBranchLine + 1; // gosub after the IRBranch label
+	  TimerCBBranchLine = - TimerCBBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
+	}
   }
+  #if defined(BASIC_TFT)
+  if (TouchBranchLine > 0)
+  {
+	if ( millis() > (Touch_millis + 100) ) 
+	{
+	  int raw;
+	  int tt = ReadTouchXY(0, &raw);
+	  if ((tt != -1) && (Touch_p == -1))
+	  {
+//        Serial.print(tt & 0xffff);
+//        Serial.print(":");
+//        Serial.print(tt >> 16);
+//        Serial.print(" ");
+//        Serial.print(raw & 0xffff);
+//        Serial.print(":");
+//        Serial.print(raw >> 16);
+//        Serial.print(" ");
+//        Serial.println(Touch_p);
+		touchX = tt & 0xffff;
+		touchY = tt >> 16;
+		touchY_raw = raw & 0xffff;
+		touchY_raw = raw >> 16;
+		// if the program is in wait, it returns to the previous line to wait again
+		return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+		WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+		RunningProgramCurrentLine = TouchBranchLine + 1; // gosub after the IRBranch label
+		TouchBranchLine = - TouchBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command  
+	  }
+	  delay(0);
+	  Touch_millis = millis();
+	  Touch_p = tt;
+	}
+  }  
+  #endif
 }
 
 String getValueforPrograming(String data, char separator, int index)
 {
   int found = 0;
   int strIndex[] = {
-    0, -1
+	0, -1
   };
   int maxIndex = data.length() - 1;
   for (int i = 0; i <= maxIndex && found <= index; i++) {
-    if (data.charAt(i) == separator || i == maxIndex) {
-      found++;
-      strIndex[0] = strIndex[1] + 1;
-      strIndex[1] = (i == maxIndex) ? i + 1 : i;
-    }
+	if (data.charAt(i) == separator || i == maxIndex) {
+	  found++;
+	  strIndex[0] = strIndex[1] + 1;
+	  strIndex[1] = (i == maxIndex) ? i + 1 : i;
+	}
   }
   return found > index ? data.substring(strIndex[0], strIndex[1]) : "";
 }
@@ -1318,7 +1910,7 @@ String getValueforPrograming(String data, char separator, int index)
 
 String getValue(String data, char separator, int index)
 {
-  data = String(data + "           ");
+  data = String(data + String(separator)+ String(separator));
   int maxIndex = data.length() - 1;
   int j = 0;
   byte WaitingForQuote;
@@ -1326,43 +1918,43 @@ String getValue(String data, char separator, int index)
   String ChunkReturnVal;
   for (int i = 0; i <= maxIndex && j <= index; i++)
   {
-    if (data[i] == '\"' )
-    {
-      i++;
-      while (i <= maxIndex && data[i] != '\"' ) {
-        chunkVal.concat(data[i]);
-        i++;
-        delay(0);
-      }
-    }
-    else if (data[i] == '|' )
-    {
-      i++;
-      while (i <= maxIndex && data[i] != '|' ) {
-        chunkVal.concat(data[i]);
-        i++;
-        delay(0);
-      }
-    }
-    else
-    {
-      if (data[i] != separator) chunkVal.concat(data[i]);
-    }
-
-    if (data[i] == separator & data[i - 1] != separator)
-    {
-      j++;
-      if (j > index)
-      {
-        //chunkVal.trim();
-        if (chunkVal != String(separator))
-        {
-          ChunkReturnVal = chunkVal;
-          break;
-        }
-      }
-      chunkVal = "";
-    }
+	if (data[i] == '\"' )
+	{
+	  i++;
+	  while (i <= maxIndex && data[i] != '\"' ) {
+		chunkVal.concat(data[i]);
+		i++;
+		delay(0);
+	  }
+	}
+	else if (data[i] == '|' )
+	{
+	  i++;
+	  while (i <= maxIndex && data[i] != '|' ) {
+		chunkVal.concat(data[i]);
+		i++;
+		delay(0);
+	  }
+	}
+	else
+	{
+	  if (data[i] != separator) chunkVal.concat(data[i]);
+	}
+
+	if (data[i] == separator & data[i - 1] != separator)
+	{
+	  j++;
+	  if (j > index)
+	  {
+		//chunkVal.trim();
+		if (chunkVal != String(separator))
+		{
+		  ChunkReturnVal = chunkVal;
+		  break;
+		}
+	  }
+	  chunkVal = "";
+	}
   }
   //    Serial.println("index");
   //    Serial.println(index);
@@ -1371,7 +1963,7 @@ String getValue(String data, char separator, int index)
   if (j == index + 1)
   {
 
-    return ChunkReturnVal;
+	return ChunkReturnVal;
   }
 }
 
@@ -1396,117 +1988,117 @@ String FetchOpenWeatherMapApi(String URLtoGet, String index)
   int list = index.toInt();
 
   if (list == 0)  // if the index is 0, it takes the first part, the root
-    phase = 3;
+	phase = 3;
 
   if (client.connect(ServerToConnectTo.c_str() , 80))
   {
-    client.print(String("GET " + PageToGet + " HTTP/1.1\r\nHost: " +  ServerToConnectTo + "\r\n\r\n"));
-    delay(300);
-
-    while (client.available())
-    {
-      delay(0);
-      //delay(1);
-      c = client.read();
-      delay(0);
-      //Serial.print(c);
-      switch (phase)
-      {
-        case 0:
-          if (c == lookforLIST[ptr])
-            ptr++;
-          else
-            ptr = 0;
-
-          if (ptr == strlen(lookforLIST))
-          {
-            phase = 1;
-            list = list - 1;
-            if (list == 0)
-            {
-              phase = 2;
-            }
-            //Serial.println("phase 0 OK");
-          }
-          break;
-
-        case 1:
-          if (c == '{')
-            graffe++;
-          else if (c == '}')
-            graffe--;
-
-          if (graffe == 0)
-          {
-            if ( (c == ',') || (c == ']') )
-              list--;
-          }
-          if (list == 0)
-          {
-            phase = 2;
-            //Serial.println("phase 1 OK");
-          }
-          break;
-
-        case 2:
-          s.concat(c);
-          cnt++;
-          if (c == '{')
-            graffe++;
-          else if (c == '}')
-            graffe--;
-
-          if ((graffe == 0) || (cnt > 600)) // max 600 chars
-          {
-            //Serial.println("phase 2 OK");
-            client.stop();
-            return s;
-          }
-
-          break;
-
-        case 3:    // search the beginning of the message starting with  {"
-          if (c == lookforBEGIN[ptr])
-            ptr++;
-          else
-            ptr = 0;
-
-          if (ptr == strlen(lookforBEGIN))
-          {
-            cnt = 2;
-            phase = 4;
-            //Serial.println("phase 3 OK");
-            s = F("{\"");
-          }
-          break;
-
-        case 4:
-          s.concat(c);
-          cnt++;
-          if (c == lookforLIST[ptr])
-            ptr++;
-          else
-            ptr = 0;
-
-          if ( (ptr == strlen(lookforLIST)) || (cnt > 1000)) // max 1000 chars
-          {
-            //Serial.println("phase 4 OK");
-            client.stop();
-            s.concat("]}");
-            return s;
-          }
-          break;
-      }
-
-      if (client.available() == false)
-      {
-        // if no data, wait for 300ms hoping that new data arrive
-        delay(300);
-      }
-
-    }//while
-    client.stop();
-    return F("END OF DATA REACHED");
+	client.print(String("GET " + PageToGet + " HTTP/1.1\r\nHost: " +  ServerToConnectTo + "\r\n\r\n"));
+	delay(300);
+
+	while (client.available())
+	{
+	  delay(0);
+	  //delay(1);
+	  c = client.read();
+	  delay(0);
+	  //Serial.print(c);
+	  switch (phase)
+	  {
+		case 0:
+		  if (c == lookforLIST[ptr])
+			ptr++;
+		  else
+			ptr = 0;
+
+		  if (ptr == strlen(lookforLIST))
+		  {
+			phase = 1;
+			list = list - 1;
+			if (list == 0)
+			{
+			  phase = 2;
+			}
+			//Serial.println("phase 0 OK");
+		  }
+		  break;
+
+		case 1:
+		  if (c == '{')
+			graffe++;
+		  else if (c == '}')
+			graffe--;
+
+		  if (graffe == 0)
+		  {
+			if ( (c == ',') || (c == ']') )
+			  list--;
+		  }
+		  if (list == 0)
+		  {
+			phase = 2;
+			//Serial.println("phase 1 OK");
+		  }
+		  break;
+
+		case 2:
+		  s.concat(c);
+		  cnt++;
+		  if (c == '{')
+			graffe++;
+		  else if (c == '}')
+			graffe--;
+
+		  if ((graffe == 0) || (cnt > 600)) // max 600 chars
+		  {
+			//Serial.println("phase 2 OK");
+			client.stop();
+			return s;
+		  }
+
+		  break;
+
+		case 3:    // search the beginning of the message starting with  {"
+		  if (c == lookforBEGIN[ptr])
+			ptr++;
+		  else
+			ptr = 0;
+
+		  if (ptr == strlen(lookforBEGIN))
+		  {
+			cnt = 2;
+			phase = 4;
+			//Serial.println("phase 3 OK");
+			s = F("{\"");
+		  }
+		  break;
+
+		case 4:
+		  s.concat(c);
+		  cnt++;
+		  if (c == lookforLIST[ptr])
+			ptr++;
+		  else
+			ptr = 0;
+
+		  if ( (ptr == strlen(lookforLIST)) || (cnt > 1000)) // max 1000 chars
+		  {
+			//Serial.println("phase 4 OK");
+			client.stop();
+			s.concat("]}");
+			return s;
+		  }
+		  break;
+	  }
+
+	  if (client.available() == false)
+	  {
+		// if no data, wait for 300ms hoping that new data arrive
+		delay(300);
+	  }
+
+	}//while
+	client.stop();
+	return F("END OF DATA REACHED");
 
   }
   client.stop();
@@ -1536,32 +2128,32 @@ String FetchWebUrl(String URLtoGet, int PortNoForPage)
 
   if (client.connect(ServerToConnectTo.c_str() , PortNoForPage))
   {
-    client.print(String("GET " + PageToGet + " HTTP/1.1\r\nHost: " +  ServerToConnectTo + "\r\n\r\n"));
-    // wait for maximum 12 x 300msec = 3.6 seconds
-    while ( ! client.available() && numberOwebTries < 12 ) {
-      numberOwebTries++;
-      delay(300);   // 300ms
-    }
+	client.print(String("GET " + PageToGet + " HTTP/1.1\r\nHost: " +  ServerToConnectTo + "\r\n\r\n"));
+	// wait for maximum 12 x 300msec = 3.6 seconds
+	while ( ! client.available() && numberOwebTries < 12 ) {
+	  numberOwebTries++;
+	  delay(300);   // 300ms
+	}
 
-    while (client.available())
-    {
-      delay(0);
-      if (str.endsWith(String("\r\n\r\n")))  str = "";
+	while (client.available())
+	{
+	  delay(0);
+	  if (str.endsWith(String("\r\n\r\n")))  str = "";
 
-      str.concat( (const char)client.read());
-      delay(0);
-      if (client.available() == false)
-      {
-        // if no data, wait for 300ms hoping that new data arrive
-        delay(300);
-      }
+	  str.concat( (const char)client.read());
+	  delay(0);
+	  if (client.available() == false)
+	  {
+		// if no data, wait for 300ms hoping that new data arrive
+		delay(300);
+	  }
 
-    }
+	}
 
 
 
-    client.stop();
-    return str.substring(0, str.indexOf(String(String(char(10)) + "0" )  ));
+	client.stop();
+	return str.substring(0, str.indexOf(String(String(char(10)) + "0" )  ));
   }
   client.stop();
   return "";
@@ -1574,9 +2166,66 @@ void serialFlush()
 
   while (Serial.available() > 0)
   {
-    delay(0);
-    char t = Serial.read();
+	delay(0);
+	char t = Serial.read();
+  }
+}
+
+
+void MQTTcallback(char* topic, byte* payload, unsigned int length) 
+{
+	String MQTTNewMSg;
+	//Serial.println("msg received");
+
+  for (int i = 0; i < length; i++) 
+  {
+	MQTTNewMSg = String(MQTTNewMSg + (char)payload[i]);
+	delay(0);
   }
+
+  if (MQTTNewMSg != MQTTlatestMsg )
+  {
+	MQTTnewMsgReceived  = 1;  
+	MQTTlatestMsg = MQTTNewMSg;
+  }  
 }
 
 
+void MQTTreconnect() {
+  // Loop until we're reconnected
+  byte reconnectAttempts = 0;
+  while (!MQTTclient.connected()) {
+	reconnectAttempts++;
+	if (reconnectAttempts > 3) return;
+	if (MQTTclient.connect("ESP8266Client")) {
+	  MQTTclient.subscribe(MQTTSubscribeTopic.c_str());
+	  if (MQTTPublishTopic != "") 
+	  {
+		  bool MQTTSendSucess = 0;
+		  while (!MQTTSendSucess)
+		  {
+			//Serial.print("Atempting to send");
+			Serial.println(MQTTPublishMSG);
+			MQTTSendSucess =  MQTTclient.publish(MQTTPublishTopic.c_str(), MQTTPublishMSG.c_str(),1);
+		    if (MQTTSendSucess) 
+			{
+				MQTTPublishTopic = "";
+				//Serial.println(MQTTSendSucess);
+				return;
+			}
+			if (reconnectAttempts > 10) return;
+			delay(0);
+			reconnectAttempts++;
+		  }
+		  
+		  
+	  }
+	  //MQTTclient.loop();
+	  //Serial.println("connected");
+	} else {
+	  Serial.print("failed, rc=");
+	  Serial.println(MQTTclient.state());
+	  delay(0);
+	}
+  } 
+}
diff --git a/ESP8266Basic/Eval.ino b/ESP8266Basic/Eval.ino
index 409c2bc..f907fc3 100644
--- a/ESP8266Basic/Eval.ino
+++ b/ESP8266Basic/Eval.ino
@@ -1,7 +1,10 @@
 #define TFT_DEMO
 #include "expression_parser_string.h"
 
+
+char bmp_buff[320 * 4];
 extern char* _parser_error_msg;
+extern String args_var[PARSER_MAX_ARGUMENT_COUNT];
 
 String evaluate(String expr)
 {
@@ -19,7 +22,7 @@ String evaluate(String expr)
   parser_result = parse_expression_with_callbacks( expr.c_str(), variable_callback, function_callback, NULL, &numeric_value, string_value  );
   if (_parser_error_msg != NULL)
   {
-    PrintAndWebOut(String(_parser_error_msg));
+    SendErrorMsg(String(_parser_error_msg));
     return F("error");
   }
   if (parser_result == PARSER_STRING)
@@ -29,6 +32,13 @@ String evaluate(String expr)
 
 }
 
+ #if defined(BASIC_TFT)
+#include "Fonts/FreeSerifBold9pt7b.h"
+#include "Fonts/FreeSerifBold12pt7b.h"
+#include "Fonts/FreeSerifBold18pt7b.h"
+#include "Fonts/FreeSerifBold24pt7b.h"
+#endif
+
 
 
 
@@ -53,17 +63,18 @@ int variable_callback( void *user_data, const char *name, float *value, String *
 
   String Name = String(name);
   delay(0);
+  LastVarNumberLookedUp = 0;
   for (int i = 0; i < TotalNumberOfVariables; i++)
   {
-      if (AllMyVariables[i].getName() == Name)
+    if (AllMyVariables[i].getName() == Name)
     {
       LastVarNumberLookedUp = i;
-        *value =  atof(AllMyVariables[i].getVar().c_str());
-        
-        *value_str = AllMyVariables[i].getVar();
-        //Serial.print("Variable "); Serial.print(Name); Serial.print(AllMyVaribles_format[i]);
-        VariableLocated = 1;
-        return AllMyVariables[i].Format; // returns the format of the variable : PARSER_TRUE if numeric, PARSER_STRING if string
+      *value =  atof(AllMyVariables[i].getVar().c_str());
+
+      *value_str = AllMyVariables[i].getVar();
+      //Serial.print("Variable "); Serial.print(Name); Serial.print(AllMyVaribles_format[i]);
+      VariableLocated = 1;
+      return AllMyVariables[i].Format; // returns the format of the variable : PARSER_TRUE if numeric, PARSER_STRING if string
     }
   }
   Name.toUpperCase();
@@ -76,16 +87,16 @@ int variable_callback( void *user_data, const char *name, float *value, String *
   if (Name == F("D5")) { *value = 14; return PARSER_TRUE;}
   if (Name == F("D6")) { *value = 12; return PARSER_TRUE;}
   if (Name == F("D7")) { *value = 13; return PARSER_TRUE;}
-  if (Name == F("D8")) { *value = 13; return PARSER_TRUE;}
+  if (Name == F("D8")) { *value = 15; return PARSER_TRUE;}
   if (Name == F("RX")) { *value =  3; return PARSER_TRUE;}
   if (Name == F("TX")) { *value =  1; return PARSER_TRUE;}
 
-    
+
   // failed to find variable, return false
   *value = 0;
   *value_str = name;
   // against my will, I have been obliged to put a PARSER_STRING here instead of PARSER_FALSE; this will inhibit the error message if the
-  // variable is not existing permitting to use any variable not initialised; :-)
+  // variable is not existing permitting to use any variable not initialized; :-)
   return PARSER_STRING;
 }
 
@@ -127,6 +138,76 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     *value_str = UdpRemoteIP.toString() + String(F(":")) + String(UdpRemotePort);
     return PARSER_STRING;
   }
+  else if ( fname == F("io") && num_args > 0 ) {
+    // function json(buffer, key)
+    // set return value
+    *value  =  UniversalPinIO(*args_str[0], String(args[1]),  args[2]);
+    return PARSER_TRUE;
+  }
+  /*
+  else if ( fname == F("io.freq") && num_args > 0 ) {
+	AnalogWriteFreq(args[0]);
+    *value  =  0;
+    return PARSER_TRUE;
+  }
+ */
+
+  else if ( fname == F("telnet.client.connect") && num_args >= 1 ) {
+    // Tellnet client connection setup.
+	if (args_str[0] != NULL & args[1] != NULL)
+	{
+		*value  = clientTelnet.connect( String(*args_str[0]).c_str(), (int)args[1]);
+		 return PARSER_TRUE;
+	}
+	else if (args_str[0] != NULL )
+	{
+		*value  = clientTelnet.connect(  String(*args_str[0]).c_str(), 23);
+		 return PARSER_TRUE;
+	}
+	SendErrorMsg(F("Missing arguments!"));
+    return PARSER_FALSE;
+  }
+  else if ( fname == F("telnet.client.available") && num_args == 0 ) {
+    // Tellnet client connection setup.
+	*value  = clientTelnet.available();
+	 return PARSER_TRUE;
+  }
+  else if ( fname == F("telnet.client.read.chr") && num_args == 0 ) {
+    // Tellnet client connection setup.
+	*value_str  = "";
+	if (clientTelnet.available()) *value_str = (char) clientTelnet.read();
+    return PARSER_STRING;
+  }
+  else if ( fname == F("telnet.client.read.str") && num_args == 0 ) {
+    // Tellnet client connection setup.
+	*value_str  = "";
+	while (clientTelnet.available())
+	{
+		*value_str += (char) clientTelnet.read();
+		delay(0);
+	}
+    return PARSER_STRING;
+  }
+  else if ( fname == F("telnet.client.write") && num_args == 1 ) {
+    // Tellnet client connection setup.
+	if (args_str[0] != NULL)
+	{
+		*value  = clientTelnet.write( String(*args_str[0]).c_str(),  String(*args_str[0]).length());
+		return PARSER_TRUE;
+	}
+
+  }
+  else if ( fname == F("telnet.client.stop") && num_args == 0 ) {
+    // Tellnet client connection setup.
+	*value  = 0;
+	clientTelnet.stop();
+	 return PARSER_TRUE;
+  }
+
+
+
+
+
   else if ( fname == F("millis") && num_args == 0 ) // the function is millis()
   {
     // set return value and return true
@@ -181,14 +262,27 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     return PARSER_STRING;
   }
 
-  else if ( fname == F("timesetup") && num_args > 0 ) {
+  else if ( (fname == F("timesetup") | fname == F("time.setup")) && num_args > 0 ) {
     String bla;
     SaveDataToFile("TimeZone", String(args[0]));
-    SaveDataToFile("DaylightSavings", String(args[1]));
-    configTime(LoadDataFromFile("TimeZone").toFloat() * 3600, LoadDataFromFile("DaylightSavings").toInt(), "pool.ntp.org", "time.nist.gov");
+	if (num_args >= 2) 
+		{SaveDataToFile("DaylightSavings", String(args[1])); }
+	else 
+		{SaveDataToFile("DaylightSavings", String(F("0")));}
+	if (num_args == 3)
+	{
+		SaveDataToFile("TimeServer", String(*args_str[2]));
+		configTime(LoadDataFromFile("TimeZone").toFloat() * 3600, LoadDataFromFile("DaylightSavings").toInt(), LoadDataFromFile("TimeServer").c_str(), "pool.ntp.org");
+	}
+	else
+	{
+		configTime(LoadDataFromFile("TimeZone").toFloat() * 3600, LoadDataFromFile("DaylightSavings").toInt(), "pool.ntp.org", "time.nist.gov");
+	}
     *value_str = "";
     return PARSER_STRING;
   }
+
+
   else if ( fname == F("mid") && num_args == 2 ) {
     // example of the mid(string, start)
     // set return value
@@ -198,46 +292,46 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("MID() : The first argument must be a string!"));
+      SendErrorMsg(F("MID() : The first argument must be a string!"));
       return PARSER_FALSE;
     }
   }
   else if ( fname == F("mid") && num_args == 3 ) {
     // example of the mid(string, start, end)
     // set return value
-    if (args_str[0] != NULL) 
+    if (args_str[0] != NULL)
     {
       *value_str = args_str[0]->substring((int) args[1] - 1, (int) (args[1] + args[2]) - 1 );
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("MID() : The first argument must be a string!"));
+      SendErrorMsg(F("MID() : The first argument must be a string!"));
       return PARSER_FALSE;
     }
   }
   else if ( fname == F("right") && num_args == 2 ) {
     // example of the right(string, length)
     // set return value
-    if (args_str[0] != NULL) 
+    if (args_str[0] != NULL)
     {
       *value_str = args_str[0]->substring(args_str[0]->length() - (int) args[1]);
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("RIGHT() : The first argument must be a string!"));
+      SendErrorMsg(F("RIGHT() : The first argument must be a string!"));
       return PARSER_FALSE;
     }
   }
   else if ( fname == F("left") && num_args == 2 ) {
     // example of the left(string, length)
     // set return value
-    if (args_str[0] != NULL) 
-    {    
+    if (args_str[0] != NULL)
+    {
       *value_str = args_str[0]->substring(0, (int) args[1]);
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("LEFT() : The first argument must be a string!"));
+      SendErrorMsg(F("LEFT() : The first argument must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -247,7 +341,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     char bla;
     if ( (args_str[0] == NULL) || ( (num_args == 3) && (args_str[2] == NULL)) )
     {
-      PrintAndWebOut(F("WORD() : The first and 3rd argument must be string!"));
+      SendErrorMsg(F("WORD() : The first and 3rd argument must be string!"));
       return PARSER_FALSE;
     }
     if (num_args == 2) bla = ' ';
@@ -261,11 +355,11 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     // set return value
     if (args_str[0] != NULL)  // we should trigger an error if the argument is not a string
     {
-    *value  = args_str[0]->length();
-    return PARSER_TRUE;
-  }
+      *value  = args_str[0]->length();
+      return PARSER_TRUE;
+    }
     else {
-      PrintAndWebOut(F("LEN() : The argument must be a string!"));
+      SendErrorMsg(F("LEN() : The argument must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -279,7 +373,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("UPPER() : The argument must be a string!"));
+      SendErrorMsg(F("UPPER() : The argument must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -293,10 +387,74 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("LOWER() : The argument must be a string!"));
+      SendErrorMsg(F("LOWER() : The argument must be a string!"));
+      return PARSER_FALSE;
+    }
+  }
+  else if ( fname == F("trim") && num_args == 1 ) {
+    // example of the lower(string)
+    // set return value
+    if (args_str[0] != NULL)  // we should trigger an error if the argument is not a string
+    {
+      args_str[0]->trim();
+      *value_str  =  *args_str[0];
+      return PARSER_STRING;
+    }
+    else {
+      SendErrorMsg(F("LOWER() : The argument must be a string!"));
+      return PARSER_FALSE;
+    }
+  }
+  else if ( fname == F("msgget") && num_args == 1 ) {
+    // example of the lower(string)
+    // set return value
+
+
+    if (args_str[0] != NULL)  // we should trigger an error if the argument is not a string
+    {
+      int str_len = args_str[0]->length() + 1;
+      char MgetToTest[str_len];
+      args_str[0]->toCharArray(MgetToTest, str_len);
+      *value_str  =  GetRidOfurlCharacters(server->arg( MgetToTest  ));
+      return PARSER_STRING;
+    }
+    else {
+      SendErrorMsg(F("msgget() : The argument must be a string!"));
       return PARSER_FALSE;
     }
   }
+
+  else if ( fname == F("serial.read.int") && num_args == 0 ) {
+    if ( Serial.available() )
+    {
+      *value  = Serial.read();
+      return PARSER_TRUE;
+    }
+    else {
+	  *value = -1;
+      return PARSER_TRUE;
+    }
+  }
+
+    else if ( fname == F("serial.read.chr") && num_args == 0 ) {
+    if ( Serial.available() )
+    {
+      *value_str  = (char) Serial.read();
+      return PARSER_STRING;
+    }
+    else {
+	  *value_str  = "-1";
+      return PARSER_STRING;
+    }
+  }
+
+    else if ( fname == F("serial.available") && num_args == 0 ) {
+
+	*value  =  Serial.available();
+    return PARSER_TRUE;
+  }
+
+
   else if ( (fname == F("instr") || fname == F("instrrev")) && ( (num_args == 2) || (num_args == 3) ) ) {
     // example of the instr(string, string)
     // set return value
@@ -315,7 +473,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_TRUE;
     }
     else {
-      PrintAndWebOut(F("INSTR() : Both arguments must be a string!"));
+      SendErrorMsg(F("INSTR() : Both arguments must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -326,12 +484,11 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       *value_str  = String((int) args[0], HEX);
       return PARSER_STRING;
     }
-    else
-      if ( num_args == 2 ) {   // example of the hex(value, nb_digits)
-        String tmp = "0000000" + String((int) args[0], HEX);
-        *value_str = tmp.substring(tmp.length() - args[1]);
-            return PARSER_STRING;
-      }
+    else if ( num_args == 2 ) {  // example of the hex(value, nb_digits)
+      String tmp = "0000000" + String((int) args[0], HEX);
+      *value_str = tmp.substring(tmp.length() - args[1]);
+      return PARSER_STRING;
+    }
   }
   else if ( fname == F("oct") && num_args == 1 ) {
     // example of the oct(value)
@@ -348,7 +505,9 @@ int function_callback( void *user_data, const char *name, const int num_args, co
   else if ( fname == F("chr") | fname == F("chr$") && num_args == 1 ) {
     // example of the chr(value)
     // set return value
-    *value_str  = String((char) args[0]);
+    *value_str = String(" ");
+    char *p = (char*) value_str->c_str();
+    *p = (char) args[0];
     return PARSER_STRING;
   }
   else if ( fname == F("asc") && num_args == 1 ) {
@@ -360,7 +519,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_TRUE;
     }
     else {
-      PrintAndWebOut(F("ASC() : The argument must be a string!"));
+      SendErrorMsg(F("ASC() : The argument must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -373,11 +532,11 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_TRUE;
     }
     else {
-      PrintAndWebOut(F("VAL() : The argument must be a string!"));
+      SendErrorMsg(F("VAL() : The argument must be a string!"));
       return PARSER_FALSE;
     }
   }
-      else if ( fname == F("hextoint") && num_args == 1 ) {
+  else if ( fname == F("hextoint") && num_args == 1 ) {
     // function hextoint(string) -> return the numeric value of the hex string
     // set return value
     if (args_str[0] != NULL)
@@ -386,7 +545,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_TRUE;
     }
     else {
-      PrintAndWebOut(F("HEXTOINT() : The argument must be a string!"));
+      SendErrorMsg(F("HEXTOINT() : The argument must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -400,10 +559,84 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("REPLACE() : All the arguments must be a string!"));
+      SendErrorMsg(F("REPLACE() : All the arguments must be a string!"));
       return PARSER_FALSE;
     }
   }
+
+  else if ( fname == F("write") && num_args == 2 ) {
+	  delay(0);
+	  *value_str = *args_str[0];
+
+	  Serial.println("Done writing data");
+	  if (args_str[1] != NULL)
+	  {
+		  SaveDataToFile(*args_str[0], *args_str[1]);
+		  return PARSER_STRING;
+	  }
+
+
+	  if (args[1] != NULL)
+	  {
+		  SaveDataToFile(*args_str[0], FloatToString(args[1]));
+		  return PARSER_STRING;
+	  }
+
+
+
+  }
+  else if ( fname == F("mqtt.setup") && num_args >= 1 ) {
+	int MQTTport = 1883;
+
+	if (num_args == 2) MQTTport = args[1];
+
+	//MQTTclient.setServer(String(*args_str[0]).c_str(), MQTTport);
+	MQTTclient.setServer("broker.mqtt-dashboard.com", MQTTport);
+
+	MQTTActivated = 1;
+	Serial.println(String("Connected to " + String(*args_str[0])));
+    *value_str = *args_str[0];
+    return PARSER_STRING;
+  }
+  else if ( fname == F("mqtt.subscribe") && num_args >= 1 ) {
+    MQTTSubscribeTopic = *args_str[0];
+    //MQTTclient.subscribe(String(*args_str[0]).c_str());
+    *value_str = *args_str[0];
+    return PARSER_STRING;
+  }
+  else if ( fname == F("mqtt.msg")) {
+    *value_str = MQTTlatestMsg;
+    return PARSER_STRING;
+  }
+  else if ( fname == F("mqtt.publish")  && num_args >= 1 ) {
+	MQTTPublishTopic = *args_str[0];
+    MQTTPublishMSG = *args_str[1];
+    *value_str = MQTTlatestMsg;
+    return PARSER_STRING;
+  }
+
+
+
+
+
+  else if ( fname == F("read") && num_args == 1 ) {
+	  *value_str = "";
+    *value_str = LoadDataFromFile(*args_str[0]);
+    return PARSER_STRING;
+  }
+  else if ( fname == F("read.val") && num_args == 1 ) {
+    *value = LoadDataFromFile(*args_str[0]).toInt();
+    return PARSER_TRUE;
+  }
+  else if ( fname == F("del.dat") && num_args == 1 ) {
+	  *value_str = "";
+	  SPIFFS.remove(String("/data/" + *args_str[0] + ".dat"));
+    return PARSER_STRING;
+  }
+
+
+
+
   else if ( fname == F("str") && num_args == 1 ) {
     // example of str(number) converts the number to string
     // set return value
@@ -413,21 +646,31 @@ int function_callback( void *user_data, const char *name, const int num_args, co
   else if ( fname == F("wifi.scan") && num_args == 0 ) {
     // function wifi.scan() -> no arguments
     // set return value
-    *value = WiFi.scanNetworks() + 1;
+	numberOfWifiScanResults = WiFi.scanNetworks() ;
+    *value = numberOfWifiScanResults;
     return PARSER_TRUE;
   }
   else if ( fname == F("wifi.ssid") && num_args == 1 ) {
     // function wifi.ssid(number)
     // set return value
+	if (numberOfWifiScanResults < args[0])return PARSER_STRING;
     *value_str =  String(WiFi.SSID(args[0] - 1));
     return PARSER_STRING;
   }
   else if ( fname == F("wifi.rssi") && num_args == 1 ) {
     // function wifi.rssi(number)
     // set return value
+	if (numberOfWifiScanResults < args[0])return PARSER_STRING;
     *value_str =  String(WiFi.RSSI(args[0] - 1));
     return PARSER_STRING;
   }
+  else if ( fname == F("wifi.bssid") && num_args == 1 ) {
+    // function wifi.rssi(number)
+    // set return value
+	if (numberOfWifiScanResults < args[0])return PARSER_STRING;
+    *value_str =  String(WiFi.BSSIDstr(args[0] - 1));
+    return PARSER_STRING;
+  }
   else if ( fname == F("ip") && num_args == 0 ) {
     // function wifi.scan() -> no arguments
     // set return value
@@ -437,20 +680,91 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       *value_str =  String(WiFi.localIP().toString());
     return PARSER_STRING;
   }
+  else if ( fname == F("wifi.connect") && num_args >= 0 ) {
+    // function wifi.connect(ap name, ap pass, ip, gateway, subnet)
+    // set return value
+	if ( (args_str[0] != NULL) && (args_str[1] != NULL) && (args_str[2] != NULL) && (args_str[3] != NULL) && (args_str[4] != NULL) )
+	{
+		*value =  ConnectToTheWIFI(*args_str[0],*args_str[1],*args_str[2],*args_str[3],*args_str[4] );
+		return PARSER_TRUE;
+	}
+	if ( (args_str[0] != NULL) && (args_str[1] != NULL) )
+	{
+		*value =  ConnectToTheWIFI(*args_str[0],*args_str[1], "", "", "");
+        return PARSER_TRUE;
+	}
+	if ( (args_str[0] != NULL))
+	{
+		*value =  ConnectToTheWIFI(*args_str[0],"", "", "", "");
+        return PARSER_TRUE;
+	}
+	*value =  ConnectToTheWIFI("","", "", "", "");
+	return PARSER_TRUE;
+  }
+  else if ( fname == F("wifi.ap") && num_args >= 0 ) {
+    // function wifi.ap(ap name, ap pass, ip, gateway, subnet)
+    // set return value
+	if ( (args_str[0] != NULL) && (args_str[1] != NULL) && (args_str[2] != NULL) && (args_str[3] != NULL) && (args_str[4] != NULL) )
+	{
+		*value =  CreateAP(*args_str[0],*args_str[1],*args_str[2],*args_str[3],*args_str[4] );
+		return PARSER_TRUE;
+	}
+	if ( (args_str[0] != NULL) && (args_str[1] != NULL) )
+	{
+		*value =  CreateAP(*args_str[0],*args_str[1], "", "", "");
+        return PARSER_TRUE;
+	}
+	if ( (args_str[0] != NULL) )
+	{
+		*value =  CreateAP(*args_str[0],"", "", "", "");
+        return PARSER_TRUE;
+	}
+	*value =  CreateAP("","", "", "", "");
+	return PARSER_TRUE;
+  }
+
+
+
+
   else if ( fname == F("wget") && num_args > 0 ) {
     // function wget(url) or wget (url, port)
     // set return value
     if (args_str[0] != NULL)
-    { 
+    {
       if (num_args == 1)  *value_str  =  FetchWebUrl(*args_str[0], 80);
       else if (num_args == 2 )   *value_str  =  FetchWebUrl(*args_str[0], args[1]);
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("WGET() : The first arguments must be a string!"));
+      SendErrorMsg(F("WGET() : The first arguments must be a string!"));
       return PARSER_FALSE;
     }
   }
+  
+#if defined(BASIC_TFT)
+    else if ( fname == F("ping") && num_args > 0 ) {
+    // function wget(url) or wget (url, port)
+    // set return value
+    if (args_str[0] != NULL)
+    {
+		if (StringToIP(String(*args_str[0])) != (0,0,0,0))
+		{
+			*value = Ping.ping( StringToIP(String(*args_str[0])));
+		}
+		else 
+		{
+			*value = Ping.ping( String(*args_str[0]).c_str());
+		}
+		
+		return PARSER_TRUE;
+    }
+    else {
+		SendErrorMsg(F("PING() : Argument must be a string!"));
+		return PARSER_FALSE;
+    }
+  }
+#endif 
+  
 
   else if ( fname == F("sendts") && num_args == 3 ) {
     // function sendts(url, field)
@@ -461,7 +775,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("SENDTS() : All the arguments must be a string!"));
+      SendErrorMsg(F("SENDTS() : All the arguments must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -477,7 +791,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("READTS() : All the arguments must be a string!"));
+      SendErrorMsg(F("READTS() : All the arguments must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -490,7 +804,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("ReadOpenWeather() : The first argument must be a string!"));
+      SendErrorMsg(F("ReadOpenWeather() : The first argument must be a string!"));
       return PARSER_FALSE;
     }
   }
@@ -503,16 +817,10 @@ int function_callback( void *user_data, const char *name, const int num_args, co
       return PARSER_STRING;
     }
     else {
-      PrintAndWebOut(F("JSON() : Both arguments must be a string!"));
+      SendErrorMsg(F("JSON() : Both arguments must be a string!"));
       return PARSER_FALSE;
     }
   }
-  else if ( fname == F("io") && num_args > 0 ) {
-    // function json(buffer, key)
-    // set return value
-    *value  =  UniversalPinIO(*args_str[0], String(args[1]),  args[2]);
-    return PARSER_TRUE;
-  }
   else if ( fname == F("neo.setup") && num_args == 1 ) {
     // function neosetup(pin)
     if (pixels != NULL)
@@ -521,14 +829,56 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     pixels->begin();
     return PARSER_STRING;
   }
-  else if ( fname == F("neo") && num_args > 0 ) {
-    // function neo(led no, r, g, b)
+ else if ( fname == F("neo") && num_args > 0 ) {
+    // function neo(led no, r, g, b ,flag)
+    // if flag == 1 then dont display neopixel, just set it in memory
     if (pixels == NULL)
     {
       pixels = new Adafruit_NeoPixel(512, 15, NEO_GRB + NEO_KHZ800);
       pixels->begin();
     }
     pixels->setPixelColor(args[0], pixels->Color(args[1], args[2], args[3]));
+    if (args[4] != 1)
+    {
+    pixels->show();
+    }
+    return PARSER_STRING;
+  }
+
+   else if ( fname == F("neo.shift") && num_args > 0 ) {
+    // ****
+    // neoshift(first pixel 0 -511,last pixel 0 to 511 ,direction -1 or +1)
+    // *****
+
+    //test if args[] out of range
+    if (args[0] > args[1] || args[0]>511 || args[1]>511)
+    {
+      SendErrorMsg(F("Neoshift error"));
+      return PARSER_FALSE;
+    }
+    if (pixels == NULL)
+    {
+      pixels = new Adafruit_NeoPixel(512, 15, NEO_GRB + NEO_KHZ800);
+      pixels->begin();
+    }
+    // move pixels
+
+    if (args[2] > 0){
+    //move pixels up one
+    for (int zz = args[1]; zz>= args[0] ; zz--){
+      uint32_t oldp = pixels->getPixelColor(zz);
+      pixels->setPixelColor(zz+1,oldp);
+      delay(0);
+    }
+    }
+    else if (args[2]<0){
+      // move down one
+      for ( int zz = args[0]; zz <= args[1] ; zz++){
+        uint32_t oldp = pixels->getPixelColor(zz);
+      pixels->setPixelColor(zz-1,oldp);
+      delay(0);
+      }
+    }
     pixels->show();
     return PARSER_STRING;
   }
@@ -536,7 +886,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     // function neostripcolor(start, end, r, g, b)
     if (pixels == NULL)
     {
-      pixels = new Adafruit_NeoPixel(512, 15, NEO_GRB + NEO_KHZ800);   
+      pixels = new Adafruit_NeoPixel(512, 15, NEO_GRB + NEO_KHZ800);
       pixels->begin();
     }
     for (int LedNo = args[0]; (LedNo <= args[1]) && (LedNo < 512); LedNo++) {
@@ -551,7 +901,7 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     // set return value
     if (pixels == NULL)
     {
-      pixels = new Adafruit_NeoPixel(512, 15, NEO_GRB + NEO_KHZ800);       
+      pixels = new Adafruit_NeoPixel(512, 15, NEO_GRB + NEO_KHZ800);
       pixels->begin();
     }
     for (int LedNo = 0; LedNo < 512  ; LedNo++) {
@@ -560,125 +910,204 @@ int function_callback( void *user_data, const char *name, const int num_args, co
     }
     pixels->show();
     return PARSER_STRING;
-  }  
-  else if ( fname == F("temp") && num_args > 0 ) {
-    // function temp(sensor #)
-    // set return value
-    *value  = sensors.getTempCByIndex(args[0]);
-    return PARSER_TRUE;
   }
-  else if (fname.startsWith(F("dht.")) )      // block DHT functions; this reduces the number of compares  
+  else if (fname == F("neo.hex") && num_args > 0){
+  // NEO HEX       (string of pixel info,first pixel,string start ie 0,1,2 will be multiplied by 3,pcount number pixels,percentage brightness 0-100)
+  // pixels are 3 hex digits ie FFF will be white 000 will be black (coded as RGB)
+    int hexlen ; //= args_str[0]->length();
+    hexlen = args[3];
+    int r,g,b;
+    int zpix; // calculated pixel value
+    String hz = "";
+    for (int npix = 0;npix < hexlen;npix ++){
+      zpix = (npix + args[2]) *3;
+    hz = args_str[0]->substring(zpix,zpix+1);
+    r = strtol(hz.c_str(),0,16);
+    r = (r<<4) *args[4] /100;
+        hz = args_str[0]->substring(zpix+1,zpix+2);
+    g = strtol(hz.c_str(),0,16);
+    g = (g<<4) * args[4] /100;
+        hz = args_str[0]->substring(zpix+2,zpix+3);
+    b = strtol(hz.c_str(),0,16);
+    b = (b<<4) * args[4] /100;
+     pixels->setPixelColor(npix + args[1], pixels->Color(r, g, b));
+    //pixels->setPixelColor(LedNo, pixels->Color(r, g, b));
+    }
+    pixels ->show();
+  return PARSER_TRUE;
+  }
+
+
+
+	else if ( fname == F("temp") && num_args < 2 ) {
+		byte deviceAddr[8]; // create 8 byte storage area for device code
+		String tmp="";
+		if (num_args==0) {
+			byte xx;
+			// Return all connected sensor ROM codes as space-separated string (16 characters each)
+			for (i=0; sensors.getAddress(deviceAddr,i); i++) // Loop while devices are found
+			{
+				delay(0);
+				if (i>0) tmp.concat(" "); // If not the first device, add a separator space
+				for (xx=0; xx<8; xx++) {
+				if (deviceAddr[xx]<16) tmp.concat("0");
+				tmp.concat(String(deviceAddr[xx], HEX));
+				}
+			}
+				*value_str = tmp;
+				return PARSER_STRING;
+			}
+			else
+			{
+			sensors.requestTemperatures(); // Tell all sensors to convert analog to digital REGARDLESS of how we are addressing them
+			if (args_str[0] != NULL)
+			{
+				// Query a sensor by ROM code. Rom code is a 16 character hexadecimal string
+				uint32_t longx;
+				for (i=0; i<16; i+=2)
+				{
+					delay(0);
+					tmp = args_str[0]->substring(i,i+2);
+					longx = strtoul(tmp.c_str(), NULL, 16);
+					deviceAddr[i>>1] = longx;
+				}
+				// Read by device rom code and set the return value
+				*value = sensors.getTempC(deviceAddr); // Perform the temperature read by device code
+			}
+			else
+			{
+			// function temp(sensor #) - Read by sensor number and set the return value
+			*value = sensors.getTempCByIndex(args[0]);
+			}
+		return PARSER_TRUE;
+		}
+	}
+  else if (fname.startsWith(F("dht.")) )      // block DHT functions; this reduces the number of compares
   {
-    fname = fname.substring(4); // skip the term i2c.   
+    fname = fname.substring(4); // skip the term dht.
     if ( fname == F("setup") ) // dht.setup(model, pin) -> model can be 11, 21, 22
-  {
-    // function dht.setup( model, pin)
-    uint8_t pin;
-    uint8_t model;
-    switch ( num_args )
-    {
-      case 1:
-        model = args[0];
-        pin = 5;
-        break;
-      case 2:
-        model = args[0];
-        pin = args[1];
-        break;
-      default:
-        model = 21; // default DHT21
-        pin = 5; // default pin
-        break;
-    } 
-    if (dht != NULL)
-      delete dht;
-    dht = new DHT(pin, model);
-    dht->begin();
-    // set return value
-    return PARSER_TRUE;
-  }
-    else if ( fname == F("temp") ) {
-    // function dht.temp()
-    // set return value
-    if (dht == NULL)
     {
-      dht = new DHT(5, 21);
+      // function dht.setup( model, pin)
+      uint8_t pin;
+      uint8_t model;
+      switch ( num_args )
+      {
+        case 1:
+          model = args[0];
+          pin = 5;
+          break;
+        case 2:
+          model = args[0];
+          pin = args[1];
+          break;
+        default:
+          model = 21; // default DHT21
+          pin = 5; // default pin
+          break;
+      }
+      if (dht != NULL)
+        delete dht;
+      dht = new DHT(pin, model);
       dht->begin();
+      // set return value
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("temp") ) {
+      // function dht.temp()
+      // set return value
+      if (dht == NULL)
+      {
+        dht = new DHT(5, 21);
+        dht->begin();
+      }
+      *value  = dht->readTemperature();
+      return PARSER_TRUE;
     }
-    *value  = dht->readTemperature();
-    return PARSER_TRUE;
-  }
     else if ( fname == F("hum") ) {
-    // function dht.hum()
-    // set return value
-    if (dht == NULL)
-    {
-      dht = new DHT(5, 21);
-      dht->begin();
-    }    
-    *value  = dht->readHumidity();
-    return PARSER_TRUE;
-  }
+      // function dht.hum()
+      // set return value
+      if (dht == NULL)
+      {
+        dht = new DHT(5, 21);
+        dht->begin();
+      }
+      *value  = dht->readHumidity();
+      return PARSER_TRUE;
+    }
     else if ( fname == F("heatindex") ) {
-    // function dht.heatindex()
-    // set return value
-    if (dht == NULL)
-    {
-      dht = new DHT(5, 21);
-      dht->begin();
-    }    
-    *value  = dht->computeHeatIndex(dht->readTemperature(), dht->readHumidity(), false);
-    return PARSER_TRUE;
-  }
+      // function dht.heatindex()
+      // set return value
+      if (dht == NULL)
+      {
+        dht = new DHT(5, 21);
+        dht->begin();
+      }
+      *value  = dht->computeHeatIndex(dht->readTemperature(), dht->readHumidity(), false);
+      return PARSER_TRUE;
+    }
   }
-  else if (fname.startsWith(F("i2c.")) )      // block I2C functions; this reduces the number of compares  
+  else if (fname.startsWith(F("i2c.")) )      // block I2C functions; this reduces the number of compares
   {
-    fname = fname.substring(4); // skip the term i2c.  
+    fname = fname.substring(4); // skip the term i2c.
     if ( fname == F("begin") && num_args == 1 ) {
-    // function i2c.begin(address)
-    // set return value
-    Wire.beginTransmission((byte)args[0]);
-    *value_str  =  String(F(""));
-    return PARSER_STRING;
-  }
+      // function i2c.begin(address)
+      // set return value
+      Wire.beginTransmission((byte)args[0]);
+      *value_str  =  String(F(""));
+      return PARSER_STRING;
+    }
     else if ( fname == F("write") && num_args == 1 ) {
-    // function i2c.write(byte to be written)
-    // set return value
-    *value_str  =  String(Wire.write((byte)args[0]));
-    return PARSER_STRING;
-  }
+      // function i2c.write(byte to be written)
+      // set return value
+      *value_str  =  String(Wire.write((byte)args[0]));
+      return PARSER_STRING;
+    }
     else if ( fname == F("end") && num_args == 0 ) {
-    // function i2c.end()
-    // set return value
-    *value_str  =  String(Wire.endTransmission());
-    return PARSER_STRING;
-  }
+      // function i2c.end()
+      // set return value
+      *value_str  =  String(Wire.endTransmission());
+      return PARSER_STRING;
+    }
     else if ( fname == F("requestfrom") && num_args > 0 ) {
-    // function i2c.requestfrom(address, qty)
-    // set return value
-    *value_str  =  String(Wire.requestFrom((byte)args[0], (byte)args[1]));
-    return PARSER_STRING;
-  }
+      // function i2c.requestfrom(address, qty)
+      // set return value
+      *value_str  =  String(Wire.requestFrom((byte)args[0], (byte)args[1]));
+      return PARSER_STRING;
+    }
 
     else if ( fname == F("available") && num_args == 0 ) {
-    // function i2c.available()
-    // set return value
-    *value_str  =  String(Wire.available());
-    return PARSER_STRING;
-  }
+      // function i2c.available()
+      // set return value
+      *value_str  =  String(Wire.available());
+      return PARSER_STRING;
+    }
 
     else if ( fname == F("read") && num_args == 0 ) {
-    // function i2c.read()
-    // set return value
-    *value_str  =  String(Wire.read());
-    return PARSER_STRING;
-  }
-  }
-  else if ( fname == F("htmlvar") && num_args > 0 ) {
-    // function json(buffer, key)
-    // set return value
-
-    *value_str  = String(String(F("VARS|")) + String(LastVarNumberLookedUp));
+      // function i2c.read()
+      // set return value
+      *value_str  =  String(Wire.read());
+      return PARSER_STRING;
+    }
+    else if ( fname == F("setup") && num_args == 2 ) {
+      // function i2c.read()
+      // set return value
+	  Wire.begin(args[0], args[1]);
+	   #if defined(BASIC_TFT)
+	  StartUp_OLED_AFTER_I2C_REMAP();
+	  lcd.begin(16, 2);
+	  #endif
+      *value  =  1;
+      return PARSER_TRUE;;
+    }
+
+
+
+  }
+  else if ( fname == F("htmlvar") && num_args > 0 ) {
+    // function json(buffer, key)
+    // set return value
+
+    *value_str  = String(String(F("VARS|")) + String(LastVarNumberLookedUp));
     return PARSER_STRING;
   }
   else if ( fname == F("unixtime") || fname == F("time") ) {
@@ -719,68 +1148,88 @@ int function_callback( void *user_data, const char *name, const int num_args, co
   }
   else if ( fname == F("gpio1reset") && num_args == 0 )
   {
-     // function gpi01reset()  -> restore the normal functionality of the pin GPIO1 (TX)
-     pinMode(1, SPECIAL);
-     return PARSER_STRING;
+    // function gpi01reset()  -> restore the normal functionality of the pin GPIO1 (TX)
+    pinMode(1, SPECIAL);
+    return PARSER_STRING;
   }
-  else if (fname.startsWith(F("spi.")) )      // block SPI functions; this reduces the number of compares  
+  else if (fname.startsWith(F("spi.")) )      // block SPI functions; this reduces the number of compares
   {
     fname = fname.substring(4); // skip the term spi.
     if ( fname == F("setup") && num_args > 0 ) {
-    SPI.begin();
-    switch(num_args)
-    {
-      case 1:  //spi.setup(speed)
-        SPI.beginTransaction( SPISettings(args[0], MSBFIRST, SPI_MODE0)); 
-        break;
-      case 2:  //spi.setup(speed, SPI_MODE)
-        SPI.beginTransaction( SPISettings(args[0], MSBFIRST, args[1])); 
-        break;    
-      case 3:  //spi.setup(speed, SPI_MODE, MSBFIRST)
-        SPI.beginTransaction( SPISettings(args[0], args[2], args[1])); 
-        break;                
-    }
+      SPI.begin();
+      switch(num_args)
+      {
+        case 1:  //spi.setup(speed)
+          SPI.beginTransaction( SPISettings(args[0], MSBFIRST, SPI_MODE0));
+          break;
+        case 2:  //spi.setup(speed, SPI_MODE)
+          SPI.beginTransaction( SPISettings(args[0], MSBFIRST, args[1]));
+          break;
+        case 3:  //spi.setup(speed, SPI_MODE, MSBFIRST)
+          SPI.beginTransaction( SPISettings(args[0], args[2], args[1]));
+          break;
+      }
       // set return value
       *value = 0;
-     return PARSER_TRUE;
-  }
+      return PARSER_TRUE;
+    }
+
+    else if ( fname == F("setfrequency") && num_args == 1 ) {    // let a = spi.write(value_number) -> send and receive a  single byte
+	SPI.setFrequency(args[0]);
+      *value = -1;
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("setmode") && num_args == 1 ) {    // let a = spi.write(value_number) -> send and receive a  single byte
+	SPI.setDataMode(args[0]);
+      *value = -1;
+      return PARSER_TRUE;
+    }
+
+
+
     else if ( fname == F("byte") && num_args == 1 ) {    // let a = spi.write(value_number) -> send and receive a  single byte
-    *value = SPI.transfer(args[0]);
-    return PARSER_TRUE;
-  }
+      *value = SPI.transfer(args[0]);
+      return PARSER_TRUE;
+    }
     else if ( fname == F("string") && num_args == 2 ) { // let a$ = spi.string(value_string, length) -> send and receive a buffer of 'length' bytes
-    String ret;
-    char c;
-    ret.reserve(args[1]);
-    for (i=0; i<args[1]; i++)
-    {
-      c = SPI.transfer(args_str[0]->c_str()[i]);
-      ret.concat(c);
+      String ret;
+      char c;
+      ret.reserve(args[1]);
+      for (i = 0; i < args[1]; i++)
+      {
+        c = SPI.transfer(args_str[0]->c_str()[i]);
+        ret.concat(c);
+      }
+      *value_str = ret;
+      return PARSER_STRING;
     }
-    *value_str = ret;
-    return PARSER_STRING;
-  }  
     else if ( fname == F("hex") && num_args == 2 ) { // let a$ = spi.hex(value_string, length) -> send and receive a buffer of 'length' bytes; each byte is a 2 char hex string
-    if (args_str[0] == NULL)  { PrintAndWebOut(F("spi.hex() : First argument must be a string!")); return PARSER_FALSE; }
-    String ret;
-    char c, t;
-    String s;
-    ret.reserve(args[1] * 2); // each received byte is 2 chars
-    for (i = 0; i < (args[1] * 2); i += 2)
-    {
-      s = args_str[0]->substring(i , i + 2);
-      t = (char) strtol( s.c_str(), 0, 16);
-      c = SPI.transfer(t);
-      s = String( c, HEX);
-      if (s.length() == 1) s = "0" + s;
-      ret.concat(s);
-    }
-    *value_str = ret;
-    return PARSER_STRING;
-  }    
+      if (args_str[0] == NULL)  {
+        SendErrorMsg(F("spi.hex() : First argument must be a string!"));
+        return PARSER_FALSE;
+      }
+      String ret;
+      char c, t;
+      String s;
+      ret.reserve(args[1] * 2); // each received byte is 2 chars
+      for (i = 0; i < (args[1] * 2); i += 2)
+      {
+        s = args_str[0]->substring(i , i + 2);
+        t = (char) strtol( s.c_str(), 0, 16);
+        c = SPI.transfer(t);
+        s = String( c, HEX);
+        if (s.length() == 1) s = "0" + s;
+        ret.concat(s);
+      }
+      *value_str = ret;
+      return PARSER_STRING;
+    }
   }
   else if ( fname == F("eval") && num_args == 1) {
-    if (args_str[0] == NULL)  { PrintAndWebOut(F("eval() : The argument must be a string!")); return PARSER_FALSE; }
+    if (args_str[0] == NULL)  {
+      SendErrorMsg(F("eval() : The argument must be a string!"));
+      return PARSER_FALSE;
+    }
     evaluate(*args_str[0]);
     *value_str = string_value;
     *value = numeric_value;
@@ -788,163 +1237,604 @@ int function_callback( void *user_data, const char *name, const int num_args, co
   }
   else if (fname.startsWith(F("ir.")) )      // block Infrared functions; this reduces the number of compares
   {
-      fname = fname.substring(3); // skip the term ir.
-      if ( fname == F("send.setup") && num_args == 1 ) {
-        // function ir.send.init(pin)   define the pin to be used for the irsend
-        // set return value
-        if (irsend != NULL)
-          delete irsend;
-        irsend = new IRsend(args[0]);
-        irsend->begin();
-        return PARSER_STRING;
-      }
-      else if ( fname == F("send.nec") && num_args == 2 ) {
-        // function ir.send.nec(code, len)   send a NEC code with the first argument and the lenght on the 2nd
-        if (args_str[0] == NULL)  { PrintAndWebOut(F("ir.send.nec() : The first argument must be a string!")); return PARSER_FALSE; }
-        irsend->sendNEC(HexToLongInt(*args_str[0]), (int) args[1]);
-        return PARSER_STRING;
-      }
-      else if ( fname == F("send.sony") && num_args == 2 ) {
-        // function ir.send.nec(code, len)   send a SONY code with the first argument and the lenght on the 2nd
-        if (args_str[0] == NULL)  { PrintAndWebOut(F("ir.send.sony() : The first argument must be a string!")); return PARSER_FALSE; }
-        irsend->sendSony(HexToLongInt(*args_str[0]), (int) args[1]);
-        return PARSER_STRING;
-      }      
-      else if ( fname == F("recv.setup") && num_args == 1 ) {
-        // function ir.recv.init(pin)   define the pin to be used for the irsend
-        // set return value
-        if (irrecv != NULL)
-          delete irrecv;
-        irrecv = new IRrecv(args[0]);
-        irrecv->enableIRIn(); // Start the receiver
-        return PARSER_STRING;
+    fname = fname.substring(3); // skip the term ir.
+    if ( fname == F("send.setup") && num_args == 1 ) {
+      // function ir.send.init(pin)   define the pin to be used for the irsend
+      // set return value
+      if (irsend != NULL)
+        delete irsend;
+      irsend = new IRsend(args[0]);
+      irsend->begin();
+      return PARSER_STRING;
+    }
+    else if ( fname == F("send") && num_args == 1 )
+    {
+      // function ir.send.nec(code, len)   send a NEC code with the first argument and the lenght on the 2nd
+      if (args_str[0] == NULL)  {
+        SendErrorMsg(F("ir.send() : Argument must be a string!"));
+        return PARSER_FALSE;
       }
-      else if ( fname == F("recv.get") && num_args == 0 ) {
-        // function ir.recv.get()   gets the code received
-        // set return value
-        *value_str = String(IRresults.value, HEX);
-        irrecv->resume(); // Receive the next value
-        return PARSER_STRING;
+  	  String IRhexCodeForOutput = getValue(*args_str[0], ':' ,0);
+  	  String IRmfgCodeForOutput = getValue(*args_str[0], ':' ,1);
+  	  byte IRbytesCodeForOutput = getValue(*args_str[0], ':' ,2).toInt();
+  	  delay(0);
+
+  	  if (IRmfgCodeForOutput == "NEC") irsend->sendNEC(HexToLongInt(IRhexCodeForOutput), (int) IRbytesCodeForOutput);
+  	  if (IRmfgCodeForOutput == "SONY") irsend->sendSony(HexToLongInt(IRhexCodeForOutput), (int) IRbytesCodeForOutput);
+	  #if defined(BASIC_TFT)
+      if (IRmfgCodeForOutput == "LG") irsend->sendLG(HexToLongInt(IRhexCodeForOutput), (int) IRbytesCodeForOutput);
+      if (IRmfgCodeForOutput == "PANASONIC") irsend->sendPanasonic(HexToLongInt(IRhexCodeForOutput), (int) IRbytesCodeForOutput);
+      if (IRmfgCodeForOutput == "SAMSUNG") irsend->sendSAMSUNG(HexToLongInt(IRhexCodeForOutput), (int) IRbytesCodeForOutput);
+	  #endif
+//      if (IRmfgCodeForOutput == "JVC") irsend->sendJVC(HexToLongInt(IRhexCodeForOutput), (int) IRbytesCodeForOutput);
+
+      return PARSER_STRING;
+    }
+    else if ( fname == F("send.nec") && num_args == 2 ) {
+      // function ir.send.nec(code, len)   send a NEC code with the first argument and the lenght on the 2nd
+      if (args_str[0] == NULL)  {
+        SendErrorMsg(F("ir.send.nec() : The first argument must be a string!"));
+        return PARSER_FALSE;
       }
-      else if ( fname == F("recv.full") && num_args == 0 ) {
-        // function ir.recv.type()   gets the type of RC received
-        // set return value
-        *value_str =   String(IRresults.value, HEX) + ":" + IRtype(IRresults.decode_type) + ":" + String(IRresults.bits);
-        irrecv->resume(); // Receive the next value
-        return PARSER_STRING;
-      }  
-      else if ( fname == F("recv.dump") && num_args == 0 ) {
-        // function ir.recv.dump()   verbose the code received permitting to identify the remote controller
-        // set return value
-        IRdump(&IRresults);
-        *value_str = String(IRresults.value, HEX);
-        irrecv->resume(); // Receive the next value
-        return PARSER_STRING;
+      irsend->sendNEC(HexToLongInt(*args_str[0]), (int) args[1]);
+      return PARSER_STRING;
+    }
+    else if ( fname == F("send.sony") && num_args == 2 ) {
+      // function ir.send.nec(code, len)   send a SONY code with the first argument and the lenght on the 2nd
+      if (args_str[0] == NULL)  {
+        SendErrorMsg(F("ir.send.sony() : The first argument must be a string!"));
+        return PARSER_FALSE;
       }
+      irsend->sendSony(HexToLongInt(*args_str[0]), (int) args[1]);
+      return PARSER_STRING;
+    }
+    else if ( fname == F("recv.setup") && num_args == 1 ) {
+      // function ir.recv.init(pin)   define the pin to be used for the irsend
+      // set return value
+      if (irrecv != NULL)
+        delete irrecv;
+      irrecv = new IRrecv(args[0]);
+      irrecv->enableIRIn(); // Start the receiver
+      return PARSER_STRING;
+    }
+    else if ( fname == F("recv.get") && num_args == 0 ) {
+      // function ir.recv.get()   gets the code received
+      // set return value
+      *value_str = String(IRresults.value, HEX);
+      irrecv->resume(); // Receive the next value
+      return PARSER_STRING;
+    }
+    else if ( fname == F("recv.full") && num_args == 0 ) {
+      // function ir.recv.type()   gets the type of RC received
+      // set return value
+      *value_str =   String(IRresults.value, HEX) + ":" + IRtype(IRresults.decode_type) + ":" + String(IRresults.bits);
+      irrecv->resume(); // Receive the next value
+      return PARSER_STRING;
+    }
+    else if ( fname == F("recv.dump") && num_args == 0 ) {
+      // function ir.recv.dump()   verbose the code received permitting to identify the remote controller
+      // set return value
+      IRdump(&IRresults);
+      *value_str = String(IRresults.value, HEX);
+      irrecv->resume(); // Receive the next value
+      return PARSER_STRING;
+    }
+  }
+
+
+#if defined(BASIC_TFT)
+    else if (fname.startsWith(F("oled.")) )      // block TFT functions; this reduces the number of compares
+  {
+    fname = fname.substring(5); // skip the term tft.
+    if ( fname == F("color") && num_args == 1 ) {
+      // function tft.fill(color)   fill the screen with the color (565)
+	  if (args[0] == 0) display.setColor(BLACK);
+	  if (args[0] == 1) display.setColor(WHITE);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("cls") && num_args == 0 ) {
+      // function tft.fill(color)   fill the screen with the color (565)
+      display.clear();
+	  display.display();
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("line") && num_args == 4) {
+      // function tft.rect(x, y, width, height, color)
+      display.drawLine(args[0], args[1], args[2], args[3]);
+	  display.display();
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("rect") && num_args == 4) {
+      // function tft.rect(x, y, width, height, color)
+      display.drawRect(args[0], args[1], args[2], args[3]);
+	  display.display();
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("rect.fill") && num_args == 4 ) {
+      // function tft.rect.fill(x, y, width, height, color)
+      display.fillRect(args[0], args[1], args[2], args[3]);
+	  display.display();
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("circle") && num_args == 3 ) {
+      // function tft.circle(x, y, radius, color)
+      display.drawCircle(args[0], args[1], args[2]);
+	  display.display();
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("circle.fill") && num_args == 3 ) {
+      // function tft.circle.fill(x, y, radius, color)
+      display.fillCircle(args[0], args[1], args[2]);
+	  display.display();
+      return PARSER_TRUE;
+    }
+
+    else if ( fname == F("font") && num_args == 1 ) {
+      // function tft.circle.fill(x, y, radius, color)
+	  if (args[0] == 10) display.setFont(ArialMT_Plain_10);
+	  if (args[0] == 16) display.setFont(ArialMT_Plain_16);
+	  if (args[0] == 24) display.setFont(ArialMT_Plain_24);
+      return PARSER_TRUE;
+    }
+
+    else if ( fname == F("print") && num_args >= 1) {
+      // function tft.text.size(size)
+      if (args[1] != NULL & args[2] !=NULL & args_str[0] != NULL) {
+		  display.drawString(args[1], args[2], *args_str[0]);
+		  display.display();
+		  }
+      else if ( args_str[1] != NULL) {
+		  display.drawString(0, 0, *args_str[0]);
+		  display.display();
+		  }
+	display.display();
+      return PARSER_STRING;
+    }
   }
+
+
   else if (fname.startsWith(F("tft.")) )      // block TFT functions; this reduces the number of compares
   {
-      fname = fname.substring(4); // skip the term tft.
-      if ( fname == F("init") && num_args >= 2 ) {
-        // function tft.init(TFT_CS, TFT_DC, Rotation)   init the ILI9341 display; Rotation can be from 0 to 3
-        // create the class if not defined
-        if (tft == NULL)
-           tft = new Adafruit_ILI9341(args[0], args[1]);
-        tft->begin();
-        if (num_args > 2)
-          tft->setRotation(args[2]);
-        tft->fillScreen(ILI9341_BLACK);
-        return PARSER_TRUE;
-      }
-      else if ( fname == F("fill") && num_args == 1 ) {
-        // function tft.fill(color)   fill the screen with the color (565)
-         tft->fillScreen(args[0]);
+    fname = fname.substring(4); // skip the term tft.
+      if ( fname == F("setup") && num_args >= 2 ) {
+      // function tft.init(TFT_CS, TFT_DC, Rotation)   init the ILI9341 display; Rotation can be from 0 to 3
+      // create the class if not defined
+      if (tft == NULL)
+        {
+        tft = new Adafruit_ILI9341(args[0], args[1]);
+        }
+        TFT_CS_pin = args[0];
+        TFT_DC_pin = args[1];
+      tft->begin();
+      if (num_args > 2)
+        tft->setRotation(args[2]);
+      tft->fillScreen(ILI9341_BLACK);
+        form1.tft = tft;
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("fill") && num_args == 1 ) {
+      // function tft.fill(color)   fill the screen with the color (565)
+      tft->fillScreen(args[0]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("cls")  ) {
+      // function tft.fill(color)   fill the screen with the color (565)
+      tft->fillScreen(0);
+	  form1.clear();
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("rgb") && num_args == 3 ) {
+      // function tft.color(red, green, blue)    returns the color in 565 format from rgb 888
+      *value = tft->color565(args[0], args[1], args[2]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("line") && num_args == 5 ) {
+      // function tft.line(x1, y1, x2, y2, color)
+      tft->drawLine(args[0], args[1], args[2], args[3], args[4]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("rect") && num_args == 5 ) {
+      // function tft.rect(x, y, width, height, color)
+      tft->drawRect(args[0], args[1], args[2], args[3], args[4]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("rect.fill") && num_args == 5 ) {
+      // function tft.rect.fill(x, y, width, height, color)
+      tft->fillRect(args[0], args[1], args[2], args[3], args[4]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("rect.round") && num_args == 6 ) {
+      // function tft.rect.round(x, y, width, height, radius, color)
+      tft->drawRoundRect(args[0], args[1], args[2], args[3], args[4], args[5]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("rect.round.fill") && num_args == 5 ) {
+      // function tft.rect.round.fill(x, y, width, height, radius, color)
+      tft->fillRoundRect(args[0], args[1], args[2], args[3], args[4], args[5]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("circle") && num_args == 4 ) {
+      // function tft.circle(x, y, radius, color)
+      tft->drawCircle(args[0], args[1], args[2], args[3]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("circle.fill") && num_args == 4 ) {
+      // function tft.circle.fill(x, y, radius, color)
+      tft->fillCircle(args[0], args[1], args[2], args[3]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("text.cursor") && num_args == 2 ) {
+      // function tft.text.cursor(x, y)
+      tft->setCursor(args[0], args[1]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("text.color") && num_args > 0 ) {
+      // function tft.text.color(color, {backcolor})   // the back color is optional
+      if (num_args == 1)
+        tft->setTextColor(args[0]);
+      else
+        tft->setTextColor(args[0], args[1]);
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("text.size") && num_args == 1 ) {
+      // function tft.text.size(size)
+      tft->setTextSize(args[0]);
+      return PARSER_TRUE;
+    }
+      else if ( fname == F("text.font") && num_args == 1 ) {
+        // function tft.text.size(size)
+         switch ((int) args[0])
+         {
+            case 0:
+              tft->setFont(NULL);
+              break;
+            case 1:
+              tft->setFont(&FreeSerifBold9pt7b);
+              break;
+            case 2:
+              tft->setFont(&FreeSerifBold12pt7b);
+              break;
+            case 3:
+              tft->setFont(&FreeSerifBold18pt7b);
+              break;
+            case 4:
+              tft->setFont(&FreeSerifBold24pt7b);
+              break;
+         }
          return PARSER_TRUE;
       }
-      else if ( fname == F("rgb") && num_args == 3 ) {
-        // function tft.color(red, green, blue)    returns the color in 565 format from rgb 888
-         *value = tft->color565(args[0], args[1], args[2]);
-         return PARSER_TRUE;
-      }  
-      else if ( fname == F("line") && num_args == 5 ) {
-        // function tft.line(x1, y1, x2, y2, color) 
-         tft->drawLine(args[0], args[1], args[2], args[3], args[4]);
-         return PARSER_TRUE;
-      }  
-      else if ( fname == F("rect") && num_args == 5 ) {
-        // function tft.rect(x, y, width, height, color) 
-         tft->drawRect(args[0], args[1], args[2], args[3], args[4]);
-         return PARSER_TRUE;
-      }  
-      else if ( fname == F("rect.fill") && num_args == 5 ) {
-        // function tft.rect.fill(x, y, width, height, color) 
-         tft->fillRect(args[0], args[1], args[2], args[3], args[4]);
+    else if ( fname == F("print") && num_args == 1 ) {
+      // function tft.text.size(size)
+      if (args_str[0] != NULL)
+        tft->print(*args_str[0]);
+      return PARSER_STRING;
+    }
+    else if ( fname == F("println") && num_args == 1 ) {
+      // function tft.text.size(size)
+      if (args_str[0] != NULL)
+        tft->println(*args_str[0]);
+      return PARSER_STRING;
+    }
+      else if ( fname == F("bmp") && num_args > 0 ) {
+        // function tft.bmp(filename, x, y, backColor)   // by default the color is transparent
+        uint16_t x = 0, y = 0;
+        int backColor = -1;
+        if (args_str[0] == NULL)  { SendErrorMsg(F("tft.bmp() : The first argument must be a string!")); return PARSER_FALSE; }
+        if (num_args > 2)
+        {
+          x = (uint16_t) args[1];
+          y = (uint16_t) args[2];
+        }
+        if (num_args > 3)
+          backColor = args[3];
+        show_bmp(*args_str[0], x, y, backColor);
          return PARSER_TRUE;
-      }  
-      else if ( fname == F("rect.round") && num_args == 6 ) {
-        // function tft.rect.round(x, y, width, height, radius, color) 
-         tft->drawRoundRect(args[0], args[1], args[2], args[3], args[4], args[5]);
+      }
+      else if ( fname == F("touch.setup") && num_args == 1 ) {
+        // function tft.touch.setup(CS_pin)   //set the pin used for the Touch CS
+         Touch_CS_pin = args[0];
+         pinMode(Touch_CS_pin, OUTPUT);
          return PARSER_TRUE;
-      }  
-      else if ( fname == F("rect.round.fill") && num_args == 5 ) {
-        // function tft.rect.round.fill(x, y, width, height, radius, color) 
-         tft->fillRoundRect(args[0], args[1], args[2], args[3], args[4], args[5]);
+      }
+      else if ( fname == F("touch.calibrate") && num_args == 0 ) {
+        // function tft.calibrate()
+         //calibrate();
          return PARSER_TRUE;
       }
-      else if ( fname == F("circle") && num_args == 4 ) {
-        // function tft.circle(x, y, radius, color) 
-         tft->drawCircle(args[0], args[1], args[2], args[3]);
+      else if ( fname == F("touchx") && num_args == 0 ) {
+        // function tft.touchx()
+         *value = touchX;
          return PARSER_TRUE;
-      }   
-      else if ( fname == F("circle.fill") && num_args == 4 ) {
-        // function tft.circle.fill(x, y, radius, color) 
-         tft->fillCircle(args[0], args[1], args[2], args[3]);
+      }
+      else if ( fname == F("touchy") && num_args == 0 ) {
+        // function tft.touchy()
+         *value = touchY;
          return PARSER_TRUE;
-      }   
-      else if ( fname == F("text.cursor") && num_args == 2 ) {
-        // function tft.text.cursor(x, y) 
-         tft->setCursor(args[0], args[1]);
+      }
+      else if ( fname == F("checktouch") && num_args == 0 ) {
+        // function tft.getitem()
+         *value = form1.checkTouch(touchX, touchY);
          return PARSER_TRUE;
-      } 
-      else if ( fname == F("text.color") && num_args > 0 ) {
-        // function tft.text.color(color, {backcolor})   // the back color is optional
-        if (num_args == 1)
-          tft->setTextColor(args[0]);
+      }
+      else if ( fname == F("obj.button") && num_args >= 5 ) {
+        // function tft.button("text", x,y,width,height, scale, forecolor ,backcolor)
+        if (args_str[0] == NULL)  { SendErrorMsg(F("tft.obj.button() : The first argument must be a string!")); return PARSER_FALSE; }
+        int obj = form1.add(BUTTON);
+        form1[obj]->x = args[1];
+        form1[obj]->y = args[2];
+        form1[obj]->width = args[3];
+        form1[obj]->height = args[4];
+        if (num_args >= 6)
+          form1[obj]->textsize = args[5];
+        else
+          form1[obj]->textsize = 2;
+        if (num_args >= 7)
+          form1[obj]->forecolor = args[6];
         else
-          tft->setTextColor(args[0], args[1]);
+          form1[obj]->forecolor = tft->color565(255,255,00);
+        if (num_args >= 8)
+          form1[obj]->backcolor = args[7];
+        else
+          form1[obj]->backcolor = tft->color565(100,100,100);
+        form1[obj]->label = *args_str[0];
+        form1.drawObject(obj);
+        *value = obj;
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.label") && num_args >= 5 ) {
+        // function tft.label("text", x,y,width,height,scale, forecolor ,backcolor)
+        if (args_str[0] == NULL)  { SendErrorMsg(F("tft.obj.label() : The first argument must be a string!")); return PARSER_FALSE; }
+        int obj = form1.add(LABEL);
+        form1[obj]->x = args[1];
+        form1[obj]->y = args[2];
+        form1[obj]->width = args[3];
+        form1[obj]->height = args[4];
+        if (num_args >= 6)
+          form1[obj]->textsize = args[5];
+        else
+          form1[obj]->textsize = 2;
+        if (num_args >= 7)
+          form1[obj]->forecolor = args[6];
+        else
+          form1[obj]->forecolor = tft->color565(255,255,00);
+        if (num_args >= 8)
+          form1[obj]->backcolor = args[7];
+        else
+          form1[obj]->backcolor = tft->color565(100,100,100);
+
+        form1[obj]->label = *args_str[0];
+        form1.drawObject(obj);
+        *value = obj;
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.checkbox") && num_args >= 4 ) {
+        // function tft.checkbox("text", x,y,width,checked, scale, forecolor ,backcolor)
+        if (args_str[0] == NULL)  { SendErrorMsg(F("tft.obj.checkbox() : The first argument must be a string!")); return PARSER_FALSE; }
+        int obj = form1.add(CHECKBOX);
+        form1[obj]->x = args[1];
+        form1[obj]->y = args[2];
+        form1[obj]->width = args[3];
+        if (num_args >= 5)
+          form1[obj]->checked = args[4];
+        else
+          form1[obj]->checked = false;
+        if (num_args >= 6)
+          form1[obj]->textsize = args[5];
+        else
+          form1[obj]->textsize = 2;
+        if (num_args >= 7)
+          form1[obj]->forecolor = args[6];
+        else
+          form1[obj]->forecolor = tft->color565(255,255,00);
+        if (num_args >= 8)
+          form1[obj]->backcolor = args[7];
+        else
+          form1[obj]->backcolor = tft->color565(100,100,100);
+
+        form1[obj]->label = *args_str[0];
+        form1.drawObject(obj);
+        *value = obj;
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.radio") && num_args >= 4 ) {
+        // function tft.checkbox("text", x,y,width,checked, scale, forecolor ,backcolor)
+        if (args_str[0] == NULL)  { SendErrorMsg(F("tft.obj.radio() : The first argument must be a string!")); return PARSER_FALSE; }
+        int obj = form1.add(RADIO);
+        form1[obj]->x = args[1];
+        form1[obj]->y = args[2];
+        form1[obj]->width = args[3];
+        if (num_args >= 5)
+          form1[obj]->checked = args[4];
+        else
+          form1[obj]->checked = false;
+        if (num_args >= 6)
+          form1[obj]->textsize = args[5];
+        else
+          form1[obj]->textsize = 2;
+        if (num_args >= 7)
+          form1[obj]->forecolor = args[6];
+        else
+          form1[obj]->forecolor = tft->color565(255,255,00);
+        if (num_args >= 8)
+          form1[obj]->backcolor = args[7];
+        else
+          form1[obj]->backcolor = tft->color565(100,100,100);
+
+        form1[obj]->label = *args_str[0];
+        form1.drawObject(obj);
+        *value = obj;
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.toggle") && num_args >= 5 ) {
+        // function tft.toggle("icon_true", "icon_false" x,y, checked, scale, back_color)
+        if (args_str[0] == NULL)  { SendErrorMsg(F("tft.obj.toggle() : The first argument must be a string!")); return PARSER_FALSE; }
+        if (args_str[1] == NULL)  { SendErrorMsg(F("tft.obj.toggle() : The second argument must be a string!")); return PARSER_FALSE; }
+        int obj = form1.add(TOGGLE);
+        form1[obj]->x = args[2];
+        form1[obj]->y = args[3];
+        form1[obj]->backcolor = args[6];
+        form1[obj]->icon1 = *args_str[0];
+        form1[obj]->icon2 = *args_str[1];
+        if (num_args >= 5)
+          form1[obj]->checked = args[4];
+        else
+          form1[obj]->checked = false;
+        if (num_args >= 6)
+          form1[obj]->scale = args[5];
+        form1.drawObject(obj);
+        *value = obj;
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.bar") && num_args >= 4 ) {
+        // function tft.bar("text", x,y,width,height, scale, forecolor ,backcolor)
+        if (args_str[0] == NULL)  { SendErrorMsg(F("tft.obj.radio() : The first argument must be a string!")); return PARSER_FALSE; }
+        int obj = form1.add(BAR);
+        form1[obj]->x = args[1];
+        form1[obj]->y = args[2];
+        form1[obj]->width = args[3];
+        if (num_args >= 5)
+          form1[obj]->height = args[4];
+        else
+          form1[obj]->height = 0;
+        if (num_args >= 6)
+          form1[obj]->textsize = args[5];
+        else
+          form1[obj]->textsize = 2;
+        if (num_args >= 7)
+          form1[obj]->forecolor = args[6];
+        else
+          form1[obj]->forecolor = tft->color565(255,255,00);
+        if (num_args >= 8)
+          form1[obj]->backcolor = args[7];
+        else
+          form1[obj]->backcolor = tft->color565(100,100,100);
+
+        form1[obj]->label = *args_str[0];
+        form1.drawObject(obj);
+        *value = obj;
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.setlabel") && num_args == 2 ) {
+        // function tft.setlabel(object_id, "label")
+        if (args_str[1] == NULL)  { SendErrorMsg(F("tft.obj.setLabel() : The second argument must be a string!")); return PARSER_FALSE; }
+        form1.setLabel(args[0], *args_str[1]);
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.setvalue") && num_args == 2 ) {
+        // function tft.setValue(object_id, value_float)
+        form1.setValue(args[0], args[1]);
         return PARSER_TRUE;
-      } 
-      else if ( fname == F("text.size") && num_args == 1 ) {
-        // function tft.text.size(size) 
-         tft->setTextSize(args[0]);
-         return PARSER_TRUE;
-      } 
-      else if ( fname == F("print") && num_args == 1 ) {
-        // function tft.text.size(size) 
-         if (args_str[0] != NULL)
-            tft->print(*args_str[0]);
-         return PARSER_STRING;
-      } 
-      else if ( fname == F("println") && num_args == 1 ) {
-        // function tft.text.size(size) 
-         if (args_str[0] != NULL)
-            tft->println(*args_str[0]);
-         return PARSER_STRING;
       }
-#ifdef TFT_DEMO
-      else if ( fname == F("test") && num_args == 0 ) {
-        ILI9341Demo();
+      else if ( fname == F("obj.setchecked") && num_args == 2 ) {
+        // function tft.setChecked(object_id, checked)  // checked can be 0(false) or any value for true
+        form1.setChecked(args[0], args[1]);
         return PARSER_TRUE;
       }
-#endif      
+      else if ( fname == F("obj.getlabel") && num_args == 1 ) {
+        // function tft.getLabel(object_id)
+        *value_str = form1.getLabel(args[0]);
+        return PARSER_STRING;
+      }
+      else if ( fname == F("obj.getvalue") && num_args == 1 ) {
+        // function tft.getValue(object_id)
+        *value = form1.getValue(args[0]);
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.getchecked") && num_args == 1 ) {
+        // function tft.getChecked(object_id)  // checked can be 0(false) or any value for true
+        *value = form1.getChecked(args[0]);
+        return PARSER_TRUE;
+      }
+      else if ( fname == F("obj.invert") && num_args == 1 ) {
+        // function tft.invertChecked(object_id)  // checked can be 0(false) or any value for true
+        *value = form1.invertChecked(args[0]);
+        return PARSER_TRUE;
+      }
+
   }
-  
-  else
-  if ( (i = Search_Array(fname)) != -1) // check if is an array
+#endif
+
+
+
+
+  else if (fname.startsWith(F("debug.")) )      // block DEBUG functions; this reduces the number of compares
+  {
+    fname = fname.substring(6); // skip the term debug.
+    if ( fname == F("setvar") && num_args >= 2 )
+    {
+      if (args_str[0] == NULL)  {
+        SendErrorMsg(F("debug.setvar() : The first argument must be a string!"));
+        return PARSER_FALSE;
+      }
+      String tmp = "set~^`" + *args_str[0] + "~^`";   // these are special chars the single quote is the reverse one (ascii code 96)
+      if (args_str[1] == NULL)
+        tmp = tmp + FloatToString(args[1]);
+      else
+        tmp = tmp + *args_str[1];
+
+      WebSocketSend(  tmp.c_str());
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("getvar") && num_args == 1 )
+    {
+      if (args_str[0] == NULL)  {
+        SendErrorMsg(F("debug.getvar() : The argument must be a string!"));
+        return PARSER_FALSE;
+      }
+      String tmp = "get~^`" + *args_str[0];   // these are special chars the single quote is the reverse one (ascii code 96)
+      WebSocketSend(  tmp.c_str());
+      WebSockMessage = "";
+      for (int i = 0; ((i < 5) && (WebSockMessage == "")); i++) // wait for the answer
+      {
+        webSocket->loop();
+        delay(0);
+      }
+      *value_str = WebSockMessage;
+      return PARSER_STRING;
+    }
+      else if ( fname == F("object") && num_args > 1 )
+    {
+        if (args_str[0] == NULL)  { SendErrorMsg(F("debug.object() : The first argument must be a string!")); return PARSER_FALSE; }
+        String tmp = *args_str[0] + "~^`";   // these are special chars the single quote is the reverse one (ascii code 96)
+        for (int i=1; i<num_args; i++)
+        {
+          if (args_str[i] == NULL)
+            tmp = tmp + FloatToString(args[i]);
+      else
+            tmp = tmp + *args_str[i];
+          tmp = tmp + "~^`";
+        }
+        webSocket->sendTXT(0,tmp.c_str());
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("log") && num_args >= 1 )
+    {
+      String tmp = "log~^`";   // these are special chars the single quote is the reverse one (ascii code 96)
+      if (args_str[0] == NULL)
+        tmp = tmp + FloatToString(args[0]);
+      else
+        tmp = tmp + *args_str[0];
+
+      WebSocketSend( tmp.c_str());
+      return PARSER_TRUE;
+    }
+    else if ( fname == F("getevent") && num_args == 0 )
+    {
+      *value_str = WebSockEventName;
+      return PARSER_STRING;
+    }
+    else if ( fname == F("getchange") && num_args == 0 )
+    {
+      *value_str = WebSockChangeName;
+      return PARSER_STRING;
+    }
+  }
+
+  else if ( (i = Search_Array(String(name))) != -1) // check if is an array
   {
     if ( num_args == 0) // the array is just defined as a name without arguments such as a$()
     {
-      Serial.println(String(F("Array without argument ")) + fname  + String(i));
+      SendErrorMsg(String(F("Array without argument ")) + String(name)  + String(i));
       return PARSER_FALSE;
     }
     else if ( num_args == 1)
@@ -982,7 +1872,7 @@ unsigned long HexToLongInt(String h)
   unsigned char c;
   int s = 0;
   h.toUpperCase();
-  for (i = h.length() -1; i >=0 ; i--)
+  for (i = h.length() - 1; i >= 0 ; i--)
   {
     // take the char starting from the right
     c = h[i];
@@ -1014,7 +1904,7 @@ String IRtype(int decode_type)
       break;
     case 4:
       return F("RC6");
-      break;      
+      break;
     case 5:
       return F("DISH");
       break;
@@ -1032,19 +1922,19 @@ String IRtype(int decode_type)
       break;
     case 10:
       return F("MITSUBISHI");
-      break;      
+      break;
     case 11:
       return F("SAMSUNG");
       break;
     case 12:
       return F("LG");
       break;
-     case 13:
+    case 13:
       return F("WHYNTER");
       break;
     default:
       return F("UNKNOWN");
-      break;     
+      break;
   }
 }
 
@@ -1108,274 +1998,380 @@ void IRdump(void *res) {
 }
 
 
-#ifdef TFT_DEMO
-void ILI9341Demo()
-{
-  testFillScreen();
-  delay(500);
-  testText();
-  delay(500);
-  testLines(ILI9341_CYAN);
-  delay(500);
-  testFastLines(ILI9341_RED, ILI9341_BLUE);
-  delay(500);
-  testRects(ILI9341_GREEN);
-  delay(500);
-  testFilledRects(ILI9341_YELLOW, ILI9341_MAGENTA);
-  delay(500);
-  testFilledCircles(10, ILI9341_MAGENTA);
-  delay(500);
-  testCircles(10, ILI9341_WHITE);
-  delay(500);
-  testTriangles();
-  delay(500);
-  testFilledTriangles();
-  delay(500);
-  testRoundRects();
-  delay(500);
-  testFilledRoundRects();
-}
-
-unsigned long testFillScreen() {
-  unsigned long start = micros();
-  tft->fillScreen(ILI9341_BLACK);
-  tft->fillScreen(ILI9341_RED);
-  tft->fillScreen(ILI9341_GREEN);
-  tft->fillScreen(ILI9341_BLUE);
-  tft->fillScreen(ILI9341_BLACK);
-  return micros() - start;
-}
-
-unsigned long testText() {
-  tft->fillScreen(ILI9341_BLACK);
-  unsigned long start = micros();
-  tft->setCursor(0, 0);
-  tft->setTextColor(ILI9341_WHITE);  tft->setTextSize(1);
-  tft->println("Hello World!");
-  tft->setTextColor(ILI9341_YELLOW); tft->setTextSize(2);
-  tft->println(1234.56);
-  tft->setTextColor(ILI9341_RED);    tft->setTextSize(3);
-  tft->println(0xDEADBEEF, HEX);
-  tft->println();
-  tft->setTextColor(ILI9341_GREEN);
-  tft->setTextSize(5);
-  tft->println("Groop");
-  tft->setTextSize(2);
-  tft->println("I implore thee,");
-  tft->setTextSize(1);
-  tft->println("my foonting turlingdromes.");
-  tft->println("And hooptiously drangle me");
-  tft->println("with crinkly bindlewurdles,");
-  tft->println("Or I will rend thee");
-  tft->println("in the gobberwarts");
-  tft->println("with my blurglecruncheon,");
-  tft->println("see if I don't!");
-  return micros() - start;
-}
-
-
-
-unsigned long testLines(uint16_t color) {
-  unsigned long start, t;
-  int           x1, y1, x2, y2,
-                w = tft->width(),
-                h = tft->height();
-
-  tft->fillScreen(ILI9341_BLACK);
-
-  x1 = y1 = 0;
-  y2    = h - 1;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft->drawLine(x1, y1, x2, y2, color);
-  x2    = w - 1;
-  for(y2=0; y2<h; y2+=6) tft->drawLine(x1, y1, x2, y2, color);
-  t     = micros() - start; // fillScreen doesn't count against timing
-
-  tft->fillScreen(ILI9341_BLACK);
-
-  x1    = w - 1;
-  y1    = 0;
-  y2    = h - 1;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft->drawLine(x1, y1, x2, y2, color);
-  x2    = 0;
-  for(y2=0; y2<h; y2+=6) tft->drawLine(x1, y1, x2, y2, color);
-  t    += micros() - start;
-
-  tft->fillScreen(ILI9341_BLACK);
-
-  x1    = 0;
-  y1    = h - 1;
-  y2    = 0;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft->drawLine(x1, y1, x2, y2, color);
-  x2    = w - 1;
-  for(y2=0; y2<h; y2+=6) tft->drawLine(x1, y1, x2, y2, color);
-  t    += micros() - start;
-
-  tft->fillScreen(ILI9341_BLACK);
-
-  x1    = w - 1;
-  y1    = h - 1;
-  y2    = 0;
-  start = micros();
-  for(x2=0; x2<w; x2+=6) tft->drawLine(x1, y1, x2, y2, color);
-  x2    = 0;
-  for(y2=0; y2<h; y2+=6) tft->drawLine(x1, y1, x2, y2, color);
-
-  return micros() - start;
-}
 
-unsigned long testFastLines(uint16_t color1, uint16_t color2) {
-  unsigned long start;
-  int           x, y, w = tft->width(), h = tft->height();
-
-  tft->fillScreen(ILI9341_BLACK);
-  start = micros();
-  for(y=0; y<h; y+=5) tft->drawFastHLine(0, y, w, color1);
-  for(x=0; x<w; x+=5) tft->drawFastVLine(x, 0, h, color2);
-
-  return micros() - start;
-}
+#if defined(BASIC_TFT)
+//////////////////////////////////////////////////////////////////////////
+/*
+typedef struct
+{
+    short   ident __attribute__((aligned(1), packed));
+    long    file_size __attribute__((aligned(1), packed));
+    long    reserved __attribute__((aligned(1), packed));
+    long    offset __attribute__((aligned(1), packed));
+    long    header_size __attribute__((aligned(1), packed));
+    long    width __attribute__((aligned(1), packed));
+    long    height __attribute__((aligned(1), packed));
+    short   planes __attribute__((aligned(1), packed));
+    short   bits_per_pixel __attribute__((aligned(1), packed));
+    long    compression __attribute__((aligned(1), packed));
+    long    image_size __attribute__((aligned(1), packed));
+    long    hor_resolution __attribute__((aligned(1), packed));
+    long    ver_resolution __attribute__((aligned(1), packed));
+    long    palette_colors __attribute__((aligned(1), packed));
+    long    important_colors __attribute__((aligned(1), packed));
+} BMP_Header;
+
+typedef struct
+{
+  unsigned char B,G,R;
+} BMP_Pixel;
 
-unsigned long testRects(uint16_t color) {
-  unsigned long start;
-  int           n, i, i2,
-                cx = tft->width()  / 2,
-                cy = tft->height() / 2;
+typedef struct
+{
+  unsigned char B,G,R,A;
+} BMP_Pixel32;
+*/
+void show_bmp(String filename, uint16_t xi, uint16_t yi, int backColor)
+{
+  int r;
+  int x, y, col;
+  uint8_t rt;
+  BMP_Pixel32  *p32;
+  BMP_Pixel *px;
+  BMP_Header header;
+
+  File fs_bmp = SPIFFS.open(filename, "r");
+  if (!fs_bmp) {
+      HaltBasic(F("bmp file not found"));
+      return;
+  }
+  r = fs_bmp.readBytes((char*) &header, sizeof(header));
+  delay(0);
+  if (sizeof(header) < header.offset) // align the buffer if the header is greather that 40bytes
+      r = fs_bmp.readBytes((char*) bmp_buff, header.offset - sizeof(header));
+//   Serial.println(header.file_size);
+//   Serial.println(header.width);
+//   Serial.println(header.height);
+//   Serial.println(header.bits_per_pixel);
+  delay(0);
 
-  tft->fillScreen(ILI9341_BLACK);
-  n     = min(tft->width(), tft->height());
-  start = micros();
-  for(i=2; i<n; i+=6) {
-    i2 = i / 2;
-    tft->drawRect(cx-i2, cy-i2, i, i, color);
+  rt = tft->getRotation();
+  tft->setRotation(rt ^ 0b10);  //reverse top/bottom
+  if (rt & 1)
+  {
+      // landscape
+      xi = 320 - xi - header.width;
+      yi = 240 - yi - header.height;
   }
-
-  return micros() - start;
-}
-
-unsigned long testFilledRects(uint16_t color1, uint16_t color2) {
-  unsigned long start, t = 0;
-  int           n, i, i2,
-                cx = tft->width()  / 2 - 1,
-                cy = tft->height() / 2 - 1;
-
-  tft->fillScreen(ILI9341_BLACK);
-  n = min(tft->width(), tft->height());
-  for(i=n; i>0; i-=6) {
-    i2    = i / 2;
-    start = micros();
-    tft->fillRect(cx-i2, cy-i2, i, i, color1);
-    t    += micros() - start;
-    // Outlines are not included in timing results
-    tft->drawRect(cx-i2, cy-i2, i, i, color2);
+  else
+  {
+      // portrait
+      xi = 240 - xi - header.width;
+      yi = 320 - yi - header.height;
   }
+  tft->setAddrWindow(xi, yi, xi + header.width - 1, yi + header.height - 1);
 
-  return t;
-}
-
-unsigned long testFilledCircles(uint8_t radius, uint16_t color) {
-  unsigned long start;
-  int x, y, w = tft->width(), h = tft->height(), r2 = radius * 2;
-
-  tft->fillScreen(ILI9341_BLACK);
-  start = micros();
-  for(x=radius; x<w; x+=r2) {
-    for(y=radius; y<h; y+=r2) {
-      tft->fillCircle(x, y, radius, color);
+  if (header.bits_per_pixel == 32)
+  {
+    for (y=0; y<header.height; y++)
+    {
+        delay(0);
+        r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel32));
+        digitalWrite(TFT_CS_pin, LOW);   // TFT CS low
+        for (x=header.width-1; x>=0; x--)
+        {
+            p32 = (BMP_Pixel32 *) &bmp_buff[x * sizeof(BMP_Pixel32)];
+            col = ((p32->R & 0xf8) << 8) |  (( p32->G & 0xfc) << 3) | ((p32->B & 0xf8) >> 3) ;
+
+            if (p32->A > 40) // means not transparent
+            {
+                if (backColor != -1)
+                  SPI.write16(col, true);
+                else
+                  tft->drawPixel(x + xi, y + yi, col);
+            }
+            else
+            {
+              if (backColor != -1)
+                SPI.write16(backColor, true);  // gets a background color pixel
+              //else
+                   //tft->drawPixel(x + xi, y + yi, 0); // background
+            }
+        }
+        digitalWrite(TFT_CS_pin, HIGH);   // TFT CS High
     }
   }
-
-  return micros() - start;
+  else
+  if (header.bits_per_pixel == 16)
+  {
+      for (y=0; y<header.height; y++)
+      {
+          delay(0);
+          r = fs_bmp.readBytes((char*) bmp_buff, header.width * 2);
+          digitalWrite(TFT_CS_pin, LOW);   // TFT CS low
+          //for (x=0; x<header.width; x++)
+          for (x=header.width-1; x>=0; x--)
+          {
+              uint16_t *cc = (uint16_t *) &bmp_buff[x * 2];
+              SPI.write16(*cc, true);
+          }
+          digitalWrite(TFT_CS_pin, HIGH);   // TFT CS High
+      }
+  }
+  else
+  {
+      for (y=0; y<header.height; y++) // should be 24
+      {
+          delay(0);
+          r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel));
+          digitalWrite(TFT_CS_pin, LOW);   // TFT CS low
+          for (x=header.width-1; x>=0; x--)
+          {
+              px = (BMP_Pixel *) &bmp_buff[x * sizeof(BMP_Pixel)];
+              col = ((px->R & 0xf8) << 8) |  (( px->G & 0xfc) << 3) | ((px->B & 0xf8) >> 3) ;
+              //tft->drawPixel(x + xi, y + yi, col);
+               SPI.write16(col, true);
+          }
+          digitalWrite(TFT_CS_pin, HIGH);   // TFT CS High
+      }
+  }
+  tft->setRotation(rt);
+  fs_bmp.close();
 }
 
-unsigned long testCircles(uint8_t radius, uint16_t color) {
-  unsigned long start;
-  int           x, y, r2 = radius * 2,
-                w = tft->width()  + radius,
-                h = tft->height() + radius;
-
-  // Screen is not cleared for this one -- this is
-  // intentional and does not affect the reported time.
-  start = micros();
-  for(x=0; x<w; x+=r2) {
-    for(y=0; y<h; y+=r2) {
-      tft->drawCircle(x, y, radius, color);
+#define AVERAGE 10
+int ReadTouchXY(char change_only, int *raw)
+{
+    unsigned char p[30];
+    unsigned char i,j, k;
+    short mx, my;
+    short mmx[AVERAGE], mmy[AVERAGE];
+    int m_x, m_y;
+    unsigned char rxd1, rxd2, rxd3, rxd4;
+    unsigned short px,py;
+    int pos;
+    static int pos_p = -1;
+    short x,y, xf, yf;
+    const unsigned short    // calibration
+            calx1 = 180,
+            calx2 = 1800,
+            caly1 = 180,
+            caly2 = 1800;
+    SPI.setFrequency(100000);
+    digitalWrite(Touch_CS_pin, LOW);   // touch CS low
+    SPI.transfer(0x9c);      // Sends the control byte
+    //delay(1);
+    for (i=0; i<AVERAGE; i++)
+    {
+        SPI.transfer(0x90);
+        rxd3 = SPI.transfer(0);
+        rxd4 = SPI.transfer(0);
+        mmy[i] = (rxd3<<4)|(rxd4>>4);
+        //delay(1);
+        SPI.transfer(0xd0);
+        rxd1 = SPI.transfer(0);
+        rxd2 = SPI.transfer(0);
+        mmx[i] = (rxd1<<4)|(rxd2>>4);
     }
-  }
+    digitalWrite(Touch_CS_pin, HIGH);   // touch CS high
 
-  return micros() - start;
-}
+    px = (rxd1<<4)|(rxd2>>4);
+//    Serial.println("px " + String(px));
+    if (px < 0x790)
+    {
+        for (j=0; j<AVERAGE; j++)
+        {
+            mx = mmx[j];
+            k = 1;
+            m_x = mx;
+            for (i=0; i<AVERAGE; i++)
+            {
+                if (abs(mx-mmx[i])<8)
+                {
+                    k++;
+                    m_x += mmx[i];
+                }
+            }
+            if (k>=AVERAGE/2)
+            {
+                px = m_x/k;
+                break;
+            }
+        }
+        if (k<AVERAGE/2)
+        {
+            return (-1);
+        }
+    }
+    else
+       return -1;
+    py = (rxd3<<4)|(rxd4>>4);
+//    Serial.println("py " + String(py));
+    if (py < 0x790)
+    {
+        for (j=0; j<AVERAGE; j++)
+        {
+            my = mmy[j];
+            k = 1;
+            m_y = my;
+            for (i=0; i<AVERAGE; i++)
+            {
+                if (abs(my-mmy[i])<8)
+                {
+                    k++;
+                    m_y += mmy[i];
+                }
+            }
+            if (k>=AVERAGE/2)
+            {
+                py = m_y / k;
+                break;
+            }
+        }
+        if (k<AVERAGE/2)
+        {
+            return (-1);
+        }
+    }
+    else
+       return -1;
 
-unsigned long testTriangles() {
-  unsigned long start;
-  int           n, i, cx = tft->width()  / 2 - 1,
-                      cy = tft->height() / 2 - 1;
+    if ((px == 0) || (py == 0) || (px > 0x780) || (py > 0x780))
+        return -1;
+    else
+    {
+        //printf("raw : x=%d y=%d\n", rxd1, rxd3);
+        x = ((px-calx1)*240) /(calx2-calx1);
+        y = ((caly2-py)*320) /(caly2-caly1);
+
+        switch (tft->getRotation())
+        {
+          case 0:
+            xf = 240 - x;
+            yf = 320 - y;
+            break;
+          case 1:
+            xf = 320 - y;
+            yf = x;
+            break;
+          case 2:
+            xf = x;
+            yf = y;
+            break;
+          case 3:
+            xf = y;
+            yf = 240 - x;
+            break;
+       }
+
+        *raw = py <<16 | px;
+
+        pos = yf<<16 | xf;
+
+        return pos;
+    }
 
-  tft->fillScreen(ILI9341_BLACK);
-  n     = min(cx, cy);
-  start = micros();
-  for(i=0; i<n; i+=5) {
-    tft->drawTriangle(
-      cx    , cy - i, // peak
-      cx - i, cy + i, // bottom left
-      cx + i, cy + i, // bottom right
-      tft->color565(0, 0, i));
-  }
+    return (-1);
 
-  return micros() - start;
 }
 
-unsigned long testFilledTriangles() {
-  unsigned long start, t = 0;
-  int           i, cx = tft->width()  / 2 - 1,
-                   cy = tft->height() / 2 - 1;
-
-  tft->fillScreen(ILI9341_BLACK);
-  start = micros();
-  for(i=min(cx,cy); i>10; i-=5) {
-    start = micros();
-    tft->fillTriangle(cx, cy - i, cx - i, cy + i, cx + i, cy + i,
-      tft->color565(0, i, i));
-    t += micros() - start;
-    tft->drawTriangle(cx, cy - i, cx - i, cy + i, cx + i, cy + i,
-      tft->color565(i, i, 0));
+/*
+void show_bmp_old(String filename, uint16_t xi, uint16_t yi)
+{
+  int r;
+  int x, y, col;
+  BMP_Pixel32  *p32;
+  BMP_Pixel *px;
+  BMP_Header header;
+  char bmp_buff[320 * 4];   // the buffer will contain a full line of 320 pixels
+
+  File fs_bmp = SPIFFS.open(filename, "r");
+  if (!fs_bmp) {
+      //Serial.println("bmp file not found");
+      HaltBasic(F("bmp file not found"));
+      return;
+  }
+  r = fs_bmp.readBytes((char*) &header, sizeof(header));
+  delay(0);
+  if (sizeof(header) < header.offset) // align the buffer if the header is greather that 40bytes
+    r = fs_bmp.readBytes((char*) bmp_buff, header.offset - sizeof(header));
+//   Serial.println(header.file_size);
+//   Serial.println(header.width);
+//   Serial.println(header.height);
+//   Serial.println(header.bits_per_pixel);
+   delay(0);
+
+  if (header.bits_per_pixel == 32)
+  {
+    for (y=header.height-1; y>=0; y--)
+    {
+        r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel32));
+        delay(0);
+        for (x=0; x<header.width; x++)
+        {
+            p32 = (BMP_Pixel32 *) &bmp_buff[x * sizeof(BMP_Pixel32)];
+            col = ((p32->R & 0xf8) << 8) |  (( p32->G & 0xfc) << 3) | ((p32->B & 0xf8) >> 3) ;
+
+            if (p32->A > 40) // means not transparent
+            {
+                tft->drawPixel(x + xi, y + yi, col);
+            }
+            else
+            {
+                //tft->drawPixel(x + xi, y + yi, 0); // background
+            }
+        }
+    }
   }
-
-  return t;
-}
-
-unsigned long testRoundRects() {
-  unsigned long start;
-  int           w, i, i2,
-                cx = tft->width()  / 2 - 1,
-                cy = tft->height() / 2 - 1;
-
-  tft->fillScreen(ILI9341_BLACK);
-  w     = min(tft->width(), tft->height());
-  start = micros();
-  for(i=0; i<w; i+=6) {
-    i2 = i / 2;
-    tft->drawRoundRect(cx-i2, cy-i2, i, i, i/8, tft->color565(i, 0, 0));
+  else
+  {
+      for (y=header.height-1; y>=0; y--)
+      {
+          r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel));
+          delay(0);
+          for (x=0; x<header.width; x++)
+          {
+              px = (BMP_Pixel *) &bmp_buff[x * sizeof(BMP_Pixel)];
+              col = ((px->R & 0xf8) << 8) |  (( px->G & 0xfc) << 3) | ((px->B & 0xf8) >> 3) ;
+              tft->drawPixel(x + xi, y + yi, col);
+          }
+      }
   }
-
-  return micros() - start;
+  fs_bmp.close();
+}
+static void calibratePoint(uint16_t x, uint16_t y, uint16_t &vi, uint16_t &vj) {
+  // Draw cross
+  tft->drawFastHLine(x - 8, y, 16, 0xff);
+  tft->drawFastVLine(x, y - 8, 16, 0xff);
+
+  while (!touch.isTouching()) {
+    delay(10);
+  }
+  touch.getRaw(vi, vj);
+  // Erase by overwriting with black
+  tft->drawFastHLine(x - 8, y, 16, 0);
+  tft->drawFastVLine(x, y - 8, 16, 0);
 }
 
-unsigned long testFilledRoundRects() {
-  unsigned long start;
-  int           i, i2,
-                cx = tft->width()  / 2 - 1,
-                cy = tft->height() / 2 - 1;
-
-  tft->fillScreen(ILI9341_BLACK);
-  start = micros();
-  for(i=min(tft->width(), tft->height()); i>20; i-=6) {
-    i2 = i / 2;
-    tft->fillRoundRect(cx-i2, cy-i2, i, i, i/8, tft->color565(0, i, 0));
-  }
-
-  return micros() - start;
+void calibrate() {
+  uint16_t x1, y1, x2, y2;
+  uint16_t vi1, vj1, vi2, vj2;
+  touch.begin(tft->getWidth(), tft->getHeight());
+  touch.getCalibrationPoints(x1, y1, x2, y2);
+  calibratePoint(x1, y1, vi1, vj1);
+  delay(1000);
+  calibratePoint(x2, y2, vi2, vj2);
+//  touch.setCalibration(vi1, vj1, vi2, vj2);
+
+//  char buf[80];
+//  snprintf(buf, sizeof(buf), "%d,%d,%d,%d", (int)vi1, (int)vj1, (int)vi2, (int)vj2);
+//  //tft->setFont(ucg_font_helvR14_tr);
+//  tft->setTextColor(0xffff);
+//  tft->setCursor(0, 25);
+//  tft->print("setCalibration params:");
+//  tft->setCursor(0, 50);
+//  tft->print(buf);
 }
+
+*/
 #endif
diff --git a/ESP8266Basic/File_system_stuff.ino b/ESP8266Basic/File_system_stuff.ino
index c7c159b..33b5061 100644
--- a/ESP8266Basic/File_system_stuff.ino
+++ b/ESP8266Basic/File_system_stuff.ino
@@ -21,7 +21,7 @@ void SaveDataToFile(String fileNameForSave, String DataToSave)
 
 String LoadDataFromFile(String fileNameForSave)
 {
-  String WhatIwillReturn;
+  String WhatIwillReturn ="";
   //SPIFFS.begin();
   File f = SPIFFS.open(String("/data/" + fileNameForSave + ".dat"), "r");
   if (!f)
@@ -35,62 +35,12 @@ String LoadDataFromFile(String fileNameForSave)
     fileOpenFail = 0;
     WhatIwillReturn =  f.readStringUntil('\r');
     WhatIwillReturn.replace("\n", "");
-    f.close();
-    return WhatIwillReturn;
-  }
-}
-
-
-
-/*
-String BasicProgram___(int LineNumberToLookUp)
-{
-  if (ProgramName == "")
-  {
-    ProgramName = F("default");
-  }
-  delay(0);
-
-  return LoadDataFromFile(String(ProgramName  + "/" + String(LineNumberToLookUp))) ;
-  delay(0);
-}
-
-
-void BasicProgramWriteLine(int LineNumberToLookUp, String DataToWriteForProgramLine)
-{
-  if (ProgramName == "")
-  {
-    ProgramName = F("default");
+    f.close();  
   }
-  delay(0);
-  SaveDataToFile(String(ProgramName  + "/" +  String(LineNumberToLookUp)), DataToWriteForProgramLine);
-  delay(0);
+  //Serial.println(String("Data Read " + WhatIwillReturn));
+  return WhatIwillReturn;
 }
 
-
-void LoadBasicProgramFromFlash__(String fileNameForSave)
-{
-  String lineToBeWrittenToFile;
-  SPIFFS.begin();
-  File f = SPIFFS.open(String("uploads/" + fileNameForSave), "r");
-  if (!f)
-  {
-    PrintAndWebOut(F("file open failed"));
-  }
-  else
-  {
-    for (int i = 0; i <= TotalNumberOfLines; i++)
-    {
-
-      lineToBeWrittenToFile = f.readStringUntil('\r');
-      lineToBeWrittenToFile.replace("\n", "");
-      BasicProgramWriteLine(i,lineToBeWrittenToFile );
-    }
-    f.close();
-  }
-  return;
-}
-*/
 //////////// New file stuff by CiccioCB /////////////
 
 static File BasicFileToSave;
@@ -176,6 +126,7 @@ void LoadBasicProgramFromFlash(String fileNameForRead)
   IfBlockList.clear();
   
   String ret;
+  String ret1;
   int i = 0;
   program_nb_lines = 0;
   //SPIFFS.begin();
@@ -204,8 +155,15 @@ void LoadBasicProgramFromFlash(String fileNameForRead)
       ret.replace("\n","");
       ret.replace("\r","");      
       ret.trim();
-      if ( (ret[0] == '[') && (ret[ret.length()-1] == ']') ) // this is a label
-        JumpList.add(ret, program_nb_lines);
+	  ret1 = ret;
+	  ret.toLowerCase();
+      if (ret1[0] == '[') // if starts with '['  // this is a label
+      {
+        // looks for the closing ']'
+        int k = ret1.indexOf(']');
+        if (k != -1)
+          JumpList.add(ret1.substring(0, k+1), program_nb_lines);
+      }
 
       if ( (ret.startsWith(F("if "))) && (ret.endsWith(F(" then"))) )
         IfBlockList.setIf(program_nb_lines);
diff --git a/ESP8266Basic/Functions_and_var_management.ino b/ESP8266Basic/Functions_and_var_management.ino
index dcfdf6a..cc9f02d 100644
--- a/ESP8266Basic/Functions_and_var_management.ino
+++ b/ESP8266Basic/Functions_and_var_management.ino
@@ -6,7 +6,9 @@ String GetMeThatVar(String VariableNameToFind)
 
 String VarialbeLookup(String VariableNameToFind)
 {
+
   VariableLocated = 0;
+  LastVarNumberLookedUp = 0;
   String MyOut = VariableNameToFind;
   for (int i = 0; i < TotalNumberOfVariables; i++)
   {
@@ -16,7 +18,7 @@ String VarialbeLookup(String VariableNameToFind)
       MyOut =  AllMyVariables[i].getVar();
       LastVarNumberLookedUp = i;
       VariableLocated = 1;
-      break;
+      return MyOut;
     }
   }
   return MyOut;
@@ -42,6 +44,8 @@ void SetMeThatVar(String VariableNameToFind, String NewContents, int format)
     {
         AllMyVariables[i].setVar(NewContents);
         AllMyVariables[i].Format = format;
+        WebSocketSend( "var~^`" + String(i) + "~^`" + String(AllMyVariables[i].getVar()) + "~^`" + String(AllMyVariables[i].getName()) );
+		if (BasicDebuggingOn == 1) WebSocketSend( "varname~^`" + String(i) + "~^`" + String(AllMyVariables[i].getName()));
         return;
     }
   }
@@ -53,6 +57,8 @@ void SetMeThatVar(String VariableNameToFind, String NewContents, int format)
       AllMyVariables[i].setName(VariableNameToFind);
       AllMyVariables[i].setVar(NewContents);
       AllMyVariables[i].Format = format;
+	  WebSocketSend( "var~^`" + String(i) + "~^`" + String(AllMyVariables[i].getVar()));
+	  if (BasicDebuggingOn == 1) WebSocketSend( "varname~^`" + String(i) + "~^`" + String(AllMyVariables[i].getName()));
       return;
     }
   }
diff --git a/ESP8266Basic/OLED_Functs.ino b/ESP8266Basic/OLED_Functs.ino
index d6aec57..a67d187 100644
--- a/ESP8266Basic/OLED_Functs.ino
+++ b/ESP8266Basic/OLED_Functs.ino
@@ -2,6 +2,7 @@
 // Lightweight Mike-Rankin OLED routines added in this project, Credits to Mike for this.
 // http://www.esp8266.com/viewtopic.php?f=29&t=3256
 
+ #if defined(BASIC_TFT)
 #include "font.h"
 #define OLED_address  0x3c  //OLED I2C bus address... even if OLED states 0x78 !!!
 
@@ -23,6 +24,13 @@ void StartUp_OLED()
   displayOn();
 }
 
+void StartUp_OLED_AFTER_I2C_REMAP()
+{
+  init_OLED();
+  reset_display();
+  displayOff();
+  displayOn();
+}
 
 void displayOn(void)
 {
@@ -191,4 +199,4 @@ static void init_OLED(void)
 ------------------------------------------------------------------------------------
 */
 
-
+#endif
diff --git a/ESP8266Basic/Pin_IO.ino b/ESP8266Basic/Pin_IO.ino
index 5ca7669..f882434 100644
--- a/ESP8266Basic/Pin_IO.ino
+++ b/ESP8266Basic/Pin_IO.ino
@@ -2,23 +2,30 @@
 float UniversalPinIO(String PinCommand, String PinDesignaor, float PinValue)
 {
   byte pin = PinDesignaor.toInt();
-  PinDesignaor.toUpperCase();
-
-  PinDesignaor.replace(F(".00"), "");
-
-  //PIN DESIGNATIONS FOR NODE MCU
-  if (PinDesignaor == F("D0"))  pin = 16;
-  if (PinDesignaor == F("D1"))  pin = 5;
-  if (PinDesignaor == F("D2"))  pin = 4;
-  if (PinDesignaor == F("D3"))  pin = 0;
-  if (PinDesignaor == F("D4"))  pin = 2;
-  if (PinDesignaor == F("D5"))  pin = 14;
-  if (PinDesignaor == F("D6"))  pin = 12;
-  if (PinDesignaor == F("D7"))  pin = 13;
-  if (PinDesignaor == F("D8"))  pin = 15;
-  if (PinDesignaor == F("RX"))  pin = 3;
-  if (PinDesignaor == F("TX"))  pin = 1;
 
+  // Let's only do NodeMCU pin translation if pin value is 0 (meaning PinDesignaor is probably a string value).  We'll check that in a moment.
+  if (pin==0) {   
+    PinDesignaor.replace(F(".00"), "");
+    if (PinDesignaor != F("0")) {   //  If PinDesignator is "0", pin is already 0 and we can skip the next 11 if statements and toUpper() function.
+
+      // Usually this block is bypassed because NodeMCU pin translation is done as converted constants in EVAL.INO. 
+      // This translation happens when a NodeMCU pin designation (eg. "D7") is passed as a string variable instead of a constant.  Rare.
+      PinDesignaor.toUpperCase();
+    
+      //PIN DESIGNATIONS FOR NODE MCU
+      if (PinDesignaor == F("D0"))  pin = 16;
+      if (PinDesignaor == F("D1"))  pin = 5;
+      if (PinDesignaor == F("D2"))  pin = 4;
+      if (PinDesignaor == F("D3"))  pin = 0;
+      if (PinDesignaor == F("D4"))  pin = 2;
+      if (PinDesignaor == F("D5"))  pin = 14;
+      if (PinDesignaor == F("D6"))  pin = 12;
+      if (PinDesignaor == F("D7"))  pin = 13;
+      if (PinDesignaor == F("D8"))  pin = 15;
+      if (PinDesignaor == F("RX"))  pin = 3;
+      if (PinDesignaor == F("TX"))  pin = 1;
+    }
+  }
 
   if (PinCommand == F("ai")) return analogRead(A0);
   if (PinCommand == F("laststat"))
@@ -28,8 +35,10 @@ float UniversalPinIO(String PinCommand, String PinDesignaor, float PinValue)
 
   if (PinCommand != F("po") & PinCommand != F("pi") & PinCommand != F("pwi") & PinCommand != F("pwo") & PinCommand != F("servo") & PinCommand != "")
   {
+	  
     PinListOfStatus[pin] = PinCommand;
     PinCommand = F("pi");
+	SetThePinMode(PinCommand, pin);
   }
   else
   {
@@ -37,12 +46,14 @@ float UniversalPinIO(String PinCommand, String PinDesignaor, float PinValue)
     {
       if ((PinListOfStatus[pin] == F("po")) | ( PinListOfStatus[pin] == F("pi")) | (PinListOfStatus[pin] == F("pwi")) | (PinListOfStatus[pin] == F("pwo"))  | (PinListOfStatus[pin] == F("servo")) | ( PinListOfStatus[pin] == ""))
       {
+		  SetThePinMode(PinCommand, pin);
         PinListOfStatus[pin] = PinCommand;
       }
 
     }
     else
     {
+		SetThePinMode(PinCommand, pin);
       PinListOfStatus[pin] = PinCommand;
     }
   }
@@ -51,7 +62,7 @@ float UniversalPinIO(String PinCommand, String PinDesignaor, float PinValue)
 
 
   PinListOfStatusValues[pin] = PinValue;
-  SetThePinMode(PinCommand, pin);
+  
   if (PinCommand == F("po")) digitalWrite(pin, PinValue);
   else if (PinCommand == F("pi")) {
     PinListOfStatusValues[pin] = digitalRead(pin);
@@ -70,32 +81,16 @@ float UniversalPinIO(String PinCommand, String PinDesignaor, float PinValue)
 
 void SetThePinMode(String PinCommand, byte pin)
 {
+  if (PinListOfStatus[pin] == PinCommand) return;
+  if (PinListOfStatus[pin].startsWith("[") & PinCommand == "pi") return;
+  
   delay(0);
 
   pinMode(pin, OUTPUT);
   analogWrite(pin, 0);
 
 
-  if (PinCommand != F("servo"))
-  {
-    if (pin == 0)   Servo0.detach();
-    if (pin == 1)   Servo1.detach();
-    if (pin == 2)   Servo2.detach();
-    if (pin == 3)   Servo3.detach();
-    if (pin == 4)   Servo4.detach();
-    if (pin == 5)   Servo5.detach();
-    //    if (pin == 6)   Servo6.detach();
-    //    if (pin == 7)   Servo7.detach();
-    //    if (pin == 8)   Servo8.detach();
-    //    if (pin == 9)   Servo9.detach();
-    //    if (pin == 10)   Servo10.detach();
-    //    if (pin == 11)   Servo11.detach();
-    if (pin == 12)   Servo12.detach();
-    if (pin == 13)   Servo13.detach();
-    if (pin == 14)   Servo14.detach();
-    if (pin == 15)   Servo15.detach();
-    if (pin == 16)   Servo16.detach();
-  }
+  if (PinCommand != F("servo")) servos[ ((pin>5) ? pin-6 : pin) ].detach();   // Shifts any high range pins down to the servo[6] to servo[10] positions.
 
   if (PinCommand == F("po") | PinCommand == F("pwo") ) pinMode(pin, OUTPUT);
   if (PinCommand == F("pi") | PinCommand == F("pwi") ) pinMode(pin, INPUT);
@@ -103,91 +98,10 @@ void SetThePinMode(String PinCommand, byte pin)
 
 void servoWrite(byte pin, int ValueForIO)
 {
-  if (pin == 0)
-  {
-    Servo0.attach(0);
-    Servo0.write(ValueForIO);
-  }
-  if (pin == 1)
-  {
-    Servo1.attach(1);
-    Servo1.write(ValueForIO);
-  }
-  if (pin == 2)
-  {
-    Servo2.attach(2);
-    Servo2.write(ValueForIO);
-  }
-  if (pin == 3)
-  {
-    Servo3.attach(3);
-    Servo3.write(ValueForIO);
-  }
-  if (pin == 4)
-  {
-    Servo4.attach(4);
-    Servo4.write(ValueForIO);
-  }
-  if (pin == 5)
-  {
-    Servo5.attach(5);
-    Servo5.write(ValueForIO);
-  }
-  //  if (pin == 6)
-  //  {
-  //    Servo6.attach(6);
-  //    Servo6.write(ValueForIO);
-  //  }
-  //  if (pin == 7)
-  //  {
-  //    Servo7.attach(7);
-  //    Servo7.write(ValueForIO);
-  //  }
-  //  if (pin == 8)
-  //  {
-  //    Servo8.attach(8);
-  //    Servo8.write(ValueForIO);
-  //  }
-  //  if (pin == 9)
-  //  {
-  //    Servo9.attach(9);
-  //    Servo9.write(ValueForIO);
-  //  }
-  //  if (pin == 10)
-  //  {
-  //    Servo10.attach(10);
-  //    Servo10.write(ValueForIO);
-  //  }
-  //  if (pin == 11)
-  //  {
-  //    Servo11.attach(11);
-  //    Servo11.write(ValueForIO);
-  //  }
-  if (pin == 12)
-  {
-    Servo12.attach(12);
-    Servo12.write(ValueForIO);
-  }
-  if (pin == 13)
-  {
-    Servo13.attach(13);
-    Servo13.write(ValueForIO);
-  }
-  if (pin == 14)
-  {
-    Servo14.attach(14);
-    Servo14.write(ValueForIO);
-  }
-  if (pin == 15)
-  {
-    Servo15.attach(15);
-    Servo15.write(ValueForIO);
-  }
-  if (pin == 16)
-  {
-    Servo16.attach(16);
-    Servo16.write(ValueForIO);
-  }
+  byte controller;
+  controller = (pin>5) ? pin-6 : pin;   // Map any high range pins (12-16) to servo objects 6-10.
+  servos[controller].attach(pin);
+  servos[controller].write(ValueForIO);
 }
 
 
diff --git a/ESP8266Basic/VERSION.h b/ESP8266Basic/VERSION.h
new file mode 100644
index 0000000..d044a1f
--- /dev/null
+++ b/ESP8266Basic/VERSION.h
@@ -0,0 +1 @@
+PROGMEM const char BasicVersion[] = "ESP Basic 3.0.Alpha 69";
diff --git a/ESP8266Basic/WIFI_stuff.ino b/ESP8266Basic/WIFI_stuff.ino
index c6ab494..e1a34ac 100644
--- a/ESP8266Basic/WIFI_stuff.ino
+++ b/ESP8266Basic/WIFI_stuff.ino
@@ -1,8 +1,17 @@
 //wifi code here
 
+
+
+
 bool ConnectToTheWIFI(String NetworkName, String NetworkPassword, String NetworkStaticIP, String NetworkGateway, String NetworkSubnet)
 {
-  WiFi.mode(WIFI_AP_STA);
+  // Serial.println(NetworkName);
+  // Serial.println(NetworkPassword);
+  // Serial.println(NetworkStaticIP);
+  // Serial.println(NetworkGateway);
+  // Serial.println(NetworkSubnet);
+  WiFi.setAutoConnect(false) ;
+  if (wifiApStaModeOn == 0) WiFi.mode(WIFI_STA);
   byte numberOfAtempts = 0;
   int str_len = NetworkName.length() + 1;
   char ssid[str_len];
@@ -33,26 +42,15 @@ delay(1000);
 
   if (NetworkStaticIP != "" & NetworkGateway != "" & NetworkSubnet != "" )
   {
-
-    NetworkStaticIP += ".";
-    NetworkGateway += ".";
-    NetworkSubnet += ".";
-    IPAddress ip(     getValue(NetworkStaticIP, '.', 0).toInt(), getValue(NetworkStaticIP, '.', 1).toInt(), getValue(NetworkStaticIP, '.', 2).toInt(), getValue(NetworkStaticIP, '.', 3).toInt());
-    IPAddress gateway(getValue(NetworkGateway,  '.', 0).toInt(), getValue(NetworkGateway, '.', 1).toInt(), getValue(NetworkGateway, '.', 2).toInt(), getValue(NetworkGateway, '.', 3).toInt());
-    IPAddress subnet( getValue(NetworkSubnet,   '.', 0).toInt(), getValue(NetworkSubnet, '.', 1).toInt(), getValue(NetworkSubnet, '.', 2).toInt(), getValue(NetworkSubnet, '.', 3).toInt());
+    IPAddress ip = StringToIP(NetworkStaticIP);
+    IPAddress gateway = StringToIP(NetworkGateway);
+    IPAddress subnet = StringToIP(NetworkSubnet);
     WiFi.config(ip, gateway, subnet);
   }
 
 delay(1000);
 
-  if (WiFi.localIP().toString().endsWith(".0"))
-  {
-    Serial.println(WiFi.localIP());
-    CreateAP("", "");
-    return 0;
-  }
-  else
-  {
+
     //configTime(3 * 3600, 0, "pool.ntp.org", "time.nist.gov");
     configTime(LoadDataFromFile("TimeZone").toFloat() * 3600, LoadDataFromFile("DaylightSavings").toInt(), "pool.ntp.org", "time.nist.gov");
     Serial.println("");
@@ -63,7 +61,7 @@ delay(1000);
     SaveDataToFile("WIFIname" ,  NetworkName);
     SaveDataToFile("WIFIpass", NetworkPassword);
     return 1;
-  }
+
 
 
 }
@@ -71,9 +69,9 @@ delay(1000);
 
 
 
-void CreateAP(String NetworkName, String NetworkPassword)
+bool CreateAP(String NetworkName, String NetworkPassword, String NetworkStaticIP, String NetworkGateway, String NetworkSubnet)
 {
-  WiFi.mode(WIFI_AP_STA);
+  if (wifiApStaModeOn == 0)WiFi.mode(WIFI_AP);
   Serial.println(F("Creating WIFI access point"));
 
 
@@ -84,7 +82,7 @@ void CreateAP(String NetworkName, String NetworkPassword)
 
     if (NetworkName == "")
     {
-      NetworkName = "ESP";
+      NetworkName = "ESP" + WiFi.softAPmacAddress();;
       NetworkPassword = "";
     }
   }
@@ -112,7 +110,18 @@ void CreateAP(String NetworkName, String NetworkPassword)
   }
   delay(2000);
 
+  if (NetworkStaticIP != "" & NetworkGateway != "" & NetworkSubnet != "" )
+  {
+    IPAddress ip = StringToIP(NetworkStaticIP);
+    IPAddress gateway = StringToIP(NetworkGateway);
+    IPAddress subnet = StringToIP(NetworkSubnet);
+    WiFi.softAPConfig(ip, gateway, subnet);  // this is the right command to change IP for STA mode
+    Serial.print(F("Station IP:"));
+    Serial.println(WiFi.softAPIP().toString());
+  }
+  
   SaveDataToFile("APname" ,  NetworkName);
   SaveDataToFile("APpass", NetworkPassword);
+  return 1;
 }
 
diff --git a/ESP8266Basic/Web_GUI_Stuff.ino b/ESP8266Basic/Web_GUI_Stuff.ino
index 3b8850d..506d2f9 100644
--- a/ESP8266Basic/Web_GUI_Stuff.ino
+++ b/ESP8266Basic/Web_GUI_Stuff.ino
@@ -1,18 +1,15 @@
 String RunningProgramGui()
 {
-
-  //PrintAndWebOut(WebArgumentsReceivedInput );
-
-  //Serial.println("Program is running. CHecking for goto statemets");
-  CheckFOrWebVarInput();
-  if (CheckFOrWebGOTO() == 1)
-  {
-    WaitForTheInterpertersResponse = 0;
-    RunningProgram == 1;
-    RunBasicTillWait();
-    WaitForTheInterpertersResponse = 1;
-  }
-
+	if (WebGuiOff == 2)
+	{
+		HTMLout = "";
+		return "GUI OFF";
+	}
+	if (WebGuiOff == 1)
+	{
+		//HTMLout = "";
+		return "GUI OFF";
+	}
 
   if (refreshBranch != "")
   {
@@ -23,46 +20,49 @@ String RunningProgramGui()
     runTillWaitPart2();
     RunBasicTillWait();
   }
-
-
-  String WebOut = String(MobileFreindlyWidth) + String(F("<form action='input'>"))  + HTMLout + String(F("</form>"));
-
-
-  if (BasicDebuggingOn == 1)
-  {
-    Serial.println(F("Web out first"));
-    Serial.println( WebOut);
-    Serial.println(F("HTML out"));
-    Serial.println( HTMLout);
-  }
+ String WebOut;
+ if (BasicDebuggingOn == 1) WebOut = String(MobileFreindlyWidth) + String(DebugPage)  + HTMLout + String(F("</div>"));
+ if (BasicDebuggingOn == 0 & RunningProgram == 1) WebOut = String(MobileFreindlyWidth) + String(F("<script src='WebSockets.js'></script><script src='/wsport.js'></script>"))  + HTMLout;
+ if (BasicDebuggingOn == 0 & RunningProgram == 0) WebOut = String(MobileFreindlyWidth) +  HTMLout;
 
   for (int i = TotalNumberOfVariables - 1; i >= 0; i--)
   {
     delay(0);
     WebOut.replace(String(F("VARS|")) + String(i), AllMyVariables[i].getVar());
   }
-
-
-  WebOut.replace(F("**graphics**"), BasicGraphics());
-
-  if (BasicDebuggingOn == 1)
-  {
-    Serial.println( WebOut);
-  }
+  
+  #if defined(BASIC_TFT)
+  WebOut.replace(F("**graphics**"), F("<iframe src='graphics.htm' style='border:none' name='gra' width='*gwid*' height='*ghei*' scrolling='no'></iframe>"));
+  #endif
+  WebOut.replace(F("*gwid*"),  String(GraphicsEliments[0][1]));
+  WebOut.replace(F("*ghei*"),  String(GraphicsEliments[0][2]));
+  WebOut.replace(F("*speed*"),  String(debugDelaySpeed));
+  
+  
   return WebOut;
 }
 
 
+void SendErrorMsg(String BasicErrorMsg)
+{
+PrintAndWebOut(	String(F("Error at line ")) + String(RunningProgramCurrentLine) + String(F(": ")) + BasicErrorMsg);
+}
+
 
 void PrintAndWebOut(String itemToBePrinted)
 {
+  delay(0);
   Serial.println(itemToBePrinted);
+  WebSocketSend( "print~^`" + itemToBePrinted);
   itemToBePrinted.replace(' ' , char(160));
-  if (HTMLout.length() < 4000)
-    HTMLout = String(HTMLout + "<hr>" + itemToBePrinted);  
+  //if ( WebGuiOff == 1 ){return;}
+  if ( WebGuiOff == 2 ){HTMLout = "";return;}
+
+  if (HTMLout.length() < 4000 | ESP.getFreeHeap() < 5000)
+    HTMLout = String(HTMLout + "<hr>" + itemToBePrinted);
   else
   {
-    HTMLout = String(HTMLout + String(F("<hr> BUFFER TOO BIG! PROGRAM STOPPED")));  
+    HTMLout = String(HTMLout + String(F("<hr> BUFFER TOO BIG! PROGRAM STOPPED")));
     Serial.println(F("BUFFER TOO BIG! PROGRAM STOPPED"));
     RunningProgram = 0;
   }
@@ -70,7 +70,48 @@ void PrintAndWebOut(String itemToBePrinted)
 }
 
 
+void AddToWebOut(String itemToBePrinted)
+{
+  delay(0);
+  //if ( WebGuiOff == 1 ){return;}
+  if ( WebGuiOff == 2 ){HTMLout = "";return;}
 
+  //itemToBePrinted.replace(' ' , char(160));
+  if (HTMLout.length() < 4000)
+    HTMLout = String(HTMLout + itemToBePrinted);
+  else
+  {
+    HTMLout = String(HTMLout + String(F("<hr> BUFFER TOO BIG! PROGRAM STOPPED")));
+    RunningProgram = 0;
+  }
+  
+    for (int i = TotalNumberOfVariables - 1; i >= 0; i--)
+  {
+    delay(0);
+    itemToBePrinted.replace(String(F("VARS|")) + String(i), AllMyVariables[i].getVar());
+  }
+    WebSocketSend( "wprint~^`" + itemToBePrinted);
+  return;
+}
+
+
+void SendAllTheVars()
+{
+  for (int i = 0; i < TotalNumberOfVariables; i++)
+  {
+    if (AllMyVariables[i].getName() == "") break;
+	if (BasicDebuggingOn == 1)  WebSocketSend( "varname~^`" + String(i) + "~^`" + String(AllMyVariables[i].getName()));
+    WebSocketSend( "var~^`" + String(i) + "~^`" + String(AllMyVariables[i].getVar()));
+    delay(0);
+    //Serial.println(i);
+  }
+  return;
+}
+
+
+
+
+#if defined(BASIC_TFT)
 String BasicGraphics()
 {
   String BasicGraphicsOut;
@@ -102,11 +143,19 @@ String BasicGraphics()
       GraphicsEliment = GraphicsRectangleCode;
     }
 
+    if (GraphicsEliments[i][0] == 5) //For rectangle
+    {
+      GraphicsEliment = GraphicsTextCode;
+    }	
+	
+	
+
 
     GraphicsEliment.replace(F("*x1*"),  String(GraphicsEliments[i][1]));
     GraphicsEliment.replace(F("*y1*"),  String(GraphicsEliments[i][2]));
     GraphicsEliment.replace(F("*x2*"),  String(GraphicsEliments[i][3]));
     GraphicsEliment.replace(F("*y2*"),  String(GraphicsEliments[i][4]));
+	GraphicsEliment.replace(F("*text*"),  GraphicsText[i]);
 
     if (GraphicsEliments[i][5] == 0 ) GraphicsEliment.replace("*collor*", F("black"));
     if (GraphicsEliments[i][5] == 1 ) GraphicsEliment.replace("*collor*", F("Navy"));
@@ -129,84 +178,207 @@ String BasicGraphics()
   BasicGraphicsOut += "</svg>";
   return BasicGraphicsOut;
 }
+#endif
 
 
 
 
+String GenerateIDtag(String TempateString)
+{
+  LastElimentIdTag = String("I" + String(millis()));
+  TempateString.replace(F("myid"), LastElimentIdTag );
+  return TempateString;
+}
+
+
 
 
 
 
-byte CheckFOrWebGOTO()
+
+void WebSocketSend(String MessageToSend)
 {
-  String bla;
-  byte x = 0;
+	if ( WebGuiOff == 1 ){Serial.println(" webguioff");return;}
+	for (byte i = 0; i <= 5; i++)
+	{
+		if (WebSocketTimeOut[i] + 20000 >=  millis())
+		{
+		 webSocket->sendTXT(i, MessageToSend);
+		// delaytime = 50 + millis();
+		  webSocket->loop();
+		}
+	}
+}
+
 
-  for (int i = 0; i <= TotalNumberOfLines - 1; i++)
-  {
-    int str_len = String(i).length() + 1 + 4;
-    char ArgumentToTest[str_len];
-    String(String("goto" + String(i))).toCharArray(ArgumentToTest, str_len);
-    delay(0);
-    bla = server->arg(ArgumentToTest);
-    if (bla.length() > 0)
-    {
-      x = i;
-    }
-  }
 
-  //Serial.println(x);
-  if (x != 0)
-  {
-    for (int i = 0; i <= TotalNumberOfLines - 1; i++) {
-      delay(0);
 
-      String gotoTest = BasicProgram(i);
-      gotoTest.trim();
 
-      if (gotoTest == ButtonsInUse[x] | String(gotoTest + ":") == ButtonsInUse[x])
+
+void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght)
+{
+  switch (type)
+  {
+    case WStype_DISCONNECTED:
+	WebSocketTimeOut[num]  = 0;
+      Serial.print(num);
+      Serial.println(" winsock Disconnected!");
+      break;
+    case WStype_CONNECTED: {
+        IPAddress ip = webSocket->remoteIP(num);
+        Serial.print(num);
+        Serial.print(" winsock connected ");
+        Serial.println(ip.toString());
+        // send message to client
+        WebSocketSend( "Connected");
+		if (BasicDebuggingOn == 1) WebSocketSend( "code~^`" + String(RunningProgramCurrentLine));
+		SendAllTheVars();
+		if (BasicDebuggingOn == 1)  WebSocketSend( "varname~^`speed~^`" + String(debugDelaySpeed));
+
+      }
+      break;
+    case WStype_TEXT:
+      if (lenght == 0)
       {
-        //Serial.println("This is the line I am going to");
-        //Serial.println(BasicProgram(i));
-        RunningProgramCurrentLine = i - 1;
-        return 1;
+        WebSockMessage == "";
+        break;
       }
-    }
+      WebSockMessage = String((char*)payload);
+      if (WebSockMessage == "OK") {
+        WebSocketTimeOut[num] = millis();
+        break;
+      }
+      // Serial.print(num);
+      // Serial.print(" get text ");
 
-  }
+      //Serial.println(WebSockMessage);
 
-  WaitForTheInterpertersResponse = 1;
-}
+	
 
+#if defined(BASIC_TFT)
+      if (WebSockMessage== F("filelist"))
+      {
+		Dir dir = SPIFFS.openDir(String(F("/") ));
+		while (dir.next()) {
+			
+			WebSocketSend(String(F("filename~^`")) + dir.fileName() );
+			delay(0);
+		}	
+        break;
+      }
+      if (WebSockMessage == F("cmd:stop"))
+      {
+        HaltBasic("");
+        break;
+      }
+      if (WebSockMessage == F("cmd:run"))
+      {
+        String WebOut;
+        RunningProgram = 1;
+        RunningProgramCurrentLine = 0;
+        WaitForTheInterpertersResponse = 0 ;
+        numberButtonInUse = 0;
+        HTMLout = "";
+        TimerWaitTime = 0;
+        TimerCBtime = 0;
+        GraphicsEliments[0][0] = 0;
+        WebOut = F(R"=====(  <meta http-equiv="refresh" content="0; url=./input?" />)=====");
+
+        clear_stacks();
+        server->send(200, "text/html", WebOut);
+        break;
+      }
+      if (WebSockMessage == F("cmd:pause"))
+      {
+        RunningProgram = 0;
+		//Serial.println("problem here 3");
+        //WaitForTheInterpertersResponse = 1;
+        break;
+      }
+      if (WebSockMessage == F("cmd:continue"))
+      {
+        RunningProgram = 1;
+        //WaitForTheInterpertersResponse = 0;
+        break;
+      }
+#endif
 
-void CheckFOrWebVarInput()
-{
-  String bla;
-
+      if (WebSockMessage.startsWith(F("guievent:")))
+      {
+        //Serial.println(WebSockMessage.substring(9));
+        break;
+      }
+      if (WebSockMessage == F("vars"))
+      {
+        SendAllTheVars();
+        break;
+      }
+      if (WebSockMessage.startsWith(F("guicmd:")))
+      {
+        //Serial.println(WebSockMessage.substring(7));
+        RunningProgram = 1;
+        WaitForTheInterpertersResponse = 0;
+        RunningProgramCurrentLine = WebSockMessage.substring(7).toInt() - 1;
+        //Serial.println("Current line = " + String(RunningProgramCurrentLine));
+        //runTillWaitPart2();
+        break;
+      }
+  
+	  
 
-  for (int i = 0; i < TotalNumberOfVariables; i++)
-  {
-    int str_len = String(i).length() + 1;
-    char ArgumentToTest[str_len];
-    String(i).toCharArray(ArgumentToTest, str_len);
-    delay(0);
-    bla = server->arg(ArgumentToTest);
-    if (bla.length() > 0)
-    {
-      bla.replace('+', ' ');
-      AllMyVariables[i].setVar(GetRidOfurlCharacters(bla));
-    }
-  }
-  return;
-}
+	  
+	  
+      if (WebSockMessage.startsWith(F("guichange~")))
+      {
+        //Serial.println(getValue(WebSockMessage, '~', 1).toInt());
+        //Serial.println(getValue(String(WebSockMessage), '~', 2));
+		if (getValue(WebSockMessage, '~', 1) != F("speed")) 
+		{
+			AllMyVariables[getValue(WebSockMessage, '~', 1).toInt()].setVar(getValue(WebSockMessage, '~', 2));
+			WebSocketSend( "var~^`" + String(getValue(WebSockMessage, '~', 1).toInt()) + "~^`" + String(AllMyVariables[getValue(WebSockMessage, '~', 1).toInt()].getVar()));
+			break;
+		}
+		else  
+		{
+			debugDelaySpeed = getValue(WebSockMessage, '~', 2).toInt();
+			Serial.println("Setting the debugger speed to ");
+			Serial.print(debugDelaySpeed );
+		}
+        
+      }
 
 
 
+      if (WebSockMessage.startsWith("event:"))
+      {
+        if (WebSockEventBranchLine > 0)
+        {
+          WebSockEventName = WebSockMessage.substring(6);
+          // if the program is in wait, it returns to the previous line to wait again
+          return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+          WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+          RunningProgramCurrentLine = WebSockEventBranchLine + 1; // gosub after the WebSockEventBranch label
+          WebSockEventBranchLine = - WebSockEventBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
+        }
+        WebSocketSend(  "_");
+        break;
+      }
 
-String GenerateIDtag(String TempateString)
-{
-  LastElimentIdTag = String(millis());
-  TempateString.replace(F("myid"),LastElimentIdTag );
-  return TempateString;
+      if (WebSockMessage.startsWith("change:"))
+      {
+        if (WebSockChangeBranchLine > 0)
+        {
+          WebSockChangeName = WebSockMessage.substring(7);
+          // if the program is in wait, it returns to the previous line to wait again
+          return_Stack.push(RunningProgramCurrentLine - WaitForTheInterpertersResponse); // push the current position in the return stack
+          WaitForTheInterpertersResponse = 0;   //exit from the wait state but comes back again after the gosub
+          RunningProgramCurrentLine = WebSockChangeBranchLine + 1; // gosub after the WebSockChangeBranch label
+          WebSockChangeBranchLine = - WebSockChangeBranchLine; // this is to avoid to go again inside the branch; it will be restored back by the return command
+        }
+        WebSocketSend( "_");
+        break;
+      }
+      break;
+  }
 }
 
diff --git a/ESP8266Basic/readme.txt b/ESP8266Basic/readme.txt
deleted file mode 100644
index 722d33f..0000000
--- a/ESP8266Basic/readme.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-new commands implemented:
-
-- neopixel on pin 2
-add of the command :
-serial2begin speed - activate serial 2 output only on pin 2   (ex serial2begin 115200)
-serial2print
-serial2println
-
-readopenweather(api_url, index) : calibrated for the Weatherwebapi forecast, permit to choose the index from the list when several lines (message is too big)
-
-jasone(json_string,message_to_find) : ex jasone(buff,"temp.max")
-
-unixtime(time_in_unix_format) : decode the unix date time (used by openweatherapi)
-
-the basic files can be updated directly from the file manager (default.bas)
-
-speedup (5 x faster)
-
-save faster
-
-open don't fails anymore
-
diff --git a/ESP8266Basic/tft.on.ino b/ESP8266Basic/tft.on.ino
new file mode 100644
index 0000000..1100622
--- /dev/null
+++ b/ESP8266Basic/tft.on.ino
@@ -0,0 +1 @@
+//#define BASIC_TFT
\ No newline at end of file
diff --git a/Flasher/Build/1M/2.0.0-rc1.zip b/Flasher/Build/1M/2.0.0-rc1.zip
deleted file mode 100644
index f3ef94e..0000000
Binary files a/Flasher/Build/1M/2.0.0-rc1.zip and /dev/null differ
diff --git a/Flasher/Build/1M/ESP8266Basic.cpp.bin b/Flasher/Build/1M/ESP8266Basic.cpp.bin
index 597b237..73e943d 100644
Binary files a/Flasher/Build/1M/ESP8266Basic.cpp.bin and b/Flasher/Build/1M/ESP8266Basic.cpp.bin differ
diff --git a/Flasher/Build/1M/libraries_cicciocb.zip b/Flasher/Build/1M/libraries_cicciocb.zip
deleted file mode 100644
index 056970c..0000000
Binary files a/Flasher/Build/1M/libraries_cicciocb.zip and /dev/null differ
diff --git a/Flasher/Build/2M/ESP8266Basic.cpp.bin b/Flasher/Build/2M/ESP8266Basic.cpp.bin
index 26574bb..1432fcd 100644
Binary files a/Flasher/Build/2M/ESP8266Basic.cpp.bin and b/Flasher/Build/2M/ESP8266Basic.cpp.bin differ
diff --git a/Flasher/Build/4M/ESP8266Basic.cpp.bin b/Flasher/Build/4M/ESP8266Basic.cpp.bin
index 98e9f97..f2ee16e 100644
Binary files a/Flasher/Build/4M/ESP8266Basic.cpp.bin and b/Flasher/Build/4M/ESP8266Basic.cpp.bin differ
diff --git a/Flasher/Build/512k/ESP8266Basic.cpp.bin b/Flasher/Build/512k/ESP8266Basic.cpp.bin
index c87a75e..471ed6f 100644
Binary files a/Flasher/Build/512k/ESP8266Basic.cpp.bin and b/Flasher/Build/512k/ESP8266Basic.cpp.bin differ
diff --git a/Flasher/Build/Format_Flash/1M.bin b/Flasher/Build/Format_Flash/1M.bin
deleted file mode 100644
index 83b968c..0000000
Binary files a/Flasher/Build/Format_Flash/1M.bin and /dev/null differ
diff --git a/Flasher/Build/Format_Flash/2M.bin b/Flasher/Build/Format_Flash/2M.bin
deleted file mode 100644
index f85c609..0000000
Binary files a/Flasher/Build/Format_Flash/2M.bin and /dev/null differ
diff --git a/Flasher/Build/Format_Flash/4M.bin b/Flasher/Build/Format_Flash/4M.bin
deleted file mode 100644
index 92a3173..0000000
Binary files a/Flasher/Build/Format_Flash/4M.bin and /dev/null differ
diff --git a/Flasher/Build/Format_Flash/512k.bin b/Flasher/Build/Format_Flash/512k.bin
deleted file mode 100644
index e5a890c..0000000
Binary files a/Flasher/Build/Format_Flash/512k.bin and /dev/null differ
diff --git a/Flasher/ESP_Basic_Flasher.exe b/Flasher/ESP_Basic_Flasher.exe
index 4f97c29..f3f4202 100644
Binary files a/Flasher/ESP_Basic_Flasher.exe and b/Flasher/ESP_Basic_Flasher.exe differ
diff --git a/Flasher/version.h b/Flasher/version.h
new file mode 100644
index 0000000..d044a1f
--- /dev/null
+++ b/Flasher/version.h
@@ -0,0 +1 @@
+PROGMEM const char BasicVersion[] = "ESP Basic 3.0.Alpha 69";
diff --git a/README.md b/README.md
index 1c95ede..a8822fe 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Basic Interpreter from scratch especialy for the ESP8266.
 
 http://esp8266basic.com
 
-http://www.esp8266basic.com/language-reference.html
+https://docs.google.com/document/d/1EiYugfu12X2_pmfmu2O19CcLX0ALgLM4r2YxKYyJon8/pub
 
 http://www.esp8266basic.com/flashing-instructions.html
 
@@ -12,8 +12,13 @@ http://www.esp8266basic.com/flashing-instructions.html
 The libraries folder contains the libraries currently being used.
 Look at licence information for each.
 
-Compile using the arduino ESP8266 package using the staging version 2.0.0-rc1
+Compile using the arduino ESP8266 package using the stable version 2.3.0
 
 Special thanks to the people who have worked to extend and improve ESP BASIC.
-Contributers include MMiscool, Cicciob and Rotohammer.
+Contributers include MMiscool, Cicciob, Rotohammer, Livetv, Tcpipchip.
 
+ESP Basic allows for browser based development of basic programs to run on the esp8266 microcontroller. 
+
+Once the firmware is installed basic programming is done with a standard web browser. 
+No usb to serial cables needed. Can be programmed from any device that has a modern web browser such as chrome.
+Even a cell phone or cheap tablet can be used to program your ESP8266 based project with out cables once the firmware is installed. 
diff --git a/libraries/Adafruit_ILI9341/Adafruit_ILI9341.h b/libraries/Adafruit_ILI9341/Adafruit_ILI9341.h
index 47a211c..8c0bf2e 100644
--- a/libraries/Adafruit_ILI9341/Adafruit_ILI9341.h
+++ b/libraries/Adafruit_ILI9341/Adafruit_ILI9341.h
@@ -111,7 +111,7 @@
 #define ILI9341_GREENYELLOW 0xAFE5      /* 173, 255,  47 */
 #define ILI9341_PINK        0xF81F
 
-//#define ILI9341_USE_DIGITAL_WRITE
+#define ILI9341_USE_DIGITAL_WRITE
 //#define ILI9341_USE_NO_CS
 #ifdef ESP8266
 //not working
@@ -166,7 +166,7 @@ class Adafruit_ILI9341 : public Adafruit_GFX {
    void area_update_start(uint32_t x, uint32_t y, uint32_t w, uint32_t h);
    void area_update_data(uint8_t *data, uint32_t pixel);
    void area_update_end(void);
- private:
+ public:
 
   uint8_t  spiread(void);
 
diff --git a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp
index 9cb0898..44eae00 100644
--- a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp
+++ b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.cpp
@@ -21,7 +21,7 @@
 // SOFTWARE.
 #include "Adafruit_MQTT.h"
 
-#ifdef ARDUINO_SAMD_ZERO
+#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_SAMD_MKR1000)
 static char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {
   char fmt[20];
   sprintf(fmt, "%%%d.%df", width, prec);
@@ -51,7 +51,7 @@ static uint8_t *stringprint(uint8_t *p, char *s) {
   uint16_t len = strlen(s);
   p[0] = len >> 8; p++;
   p[0] = len & 0xFF; p++;
-  memcpy(p, s, len);
+  memmove(p, s, len);
   return p+len;
 }
 */
@@ -78,11 +78,11 @@ static uint8_t *stringprint_P(uint8_t *p, const char *s, uint16_t maxlen=0) {
 
 // Adafruit_MQTT Definition ////////////////////////////////////////////////////
 
-Adafruit_MQTT::Adafruit_MQTT(const char *server,
+Adafruit_MQTT::Adafruit_MQTT(char *server,
                              uint16_t port,
-                             const char *cid,
-                             const char *user,
-                             const char *pass) {
+                             char *cid,
+                             char *user,
+                             char *pass) {
   servername = server;
   portnum = port;
   clientid = cid;
@@ -94,6 +94,11 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
     subscriptions[i] = 0;
   }
 
+  will_topic = 0;
+  will_payload = 0;
+  will_qos = 0;
+  will_retain = 0;
+
   packet_id_counter = 0;
 
 }
@@ -115,6 +120,11 @@ Adafruit_MQTT::Adafruit_MQTT(const __FlashStringHelper *server,
     subscriptions[i] = 0;
   }
 
+  will_topic = 0;
+  will_payload = 0;
+  will_qos = 0;
+  will_retain = 0;
+
   packet_id_counter = 0;
 
 }
@@ -134,6 +144,11 @@ Adafruit_MQTT::Adafruit_MQTT(const char *server,
     subscriptions[i] = 0;
   }
 
+  will_topic = 0;
+  will_payload = 0;
+  will_qos = 0;
+  will_retain = 0;
+
   packet_id_counter = 0;
 
 }
@@ -154,6 +169,11 @@ Adafruit_MQTT::Adafruit_MQTT(const __FlashStringHelper *server,
     subscriptions[i] = 0;
   }
 
+  will_topic = 0;
+  will_payload = 0;
+  will_qos = 0;
+  will_retain = 0;
+
   packet_id_counter = 0;
 
 }
@@ -169,7 +189,7 @@ int8_t Adafruit_MQTT::connect() {
     return -1;
 
   // Read connect response packet and verify it
-  len = readPacket(buffer, 4, CONNECT_TIMEOUT_MS);
+  len = readFullPacket(buffer, CONNECT_TIMEOUT_MS);
   if (len != 4)
     return -1;
   if ((buffer[0] != (MQTT_CTRL_CONNECTACK << 4)) || (buffer[1] != 2))
@@ -182,37 +202,98 @@ int8_t Adafruit_MQTT::connect() {
     // Ignore subscriptions that aren't defined.
     if (subscriptions[i] == 0) continue;
 
-    // Construct and send subscription packet.
-    uint8_t len = subscribePacket(buffer, subscriptions[i]->topic, subscriptions[i]->qos);
-    if (!sendPacket(buffer, len))
-      return -1;
-
-    // Check for SUBACK if using MQTT 3.1.1 or higher
-    // TODO: The Server is permitted to start sending PUBLISH packets matching the
-    // Subscription before the Server sends the SUBACK Packet.
-    // if(MQTT_PROTOCOL_LEVEL > 3) {
-    //   len = readPacket(buffer, 5, CONNECT_TIMEOUT_MS);
-    //   DEBUG_PRINT(F("SUBACK:\t"));
-    //   DEBUG_PRINTBUFFER(buffer, len);
-    //   if ((len != 5) || (buffer[0] != (MQTT_CTRL_SUBACK << 4))) {
-    //     return 6;  // failure to subscribe
-    //   }
-    // }
+    boolean success = false;
+    for (uint8_t retry=0; (retry<3) && !success; retry++) { // retry until we get a suback    
+      // Construct and send subscription packet.
+      uint8_t len = subscribePacket(buffer, subscriptions[i]->topic, subscriptions[i]->qos);
+      if (!sendPacket(buffer, len))
+	return -1;
 
+      if(MQTT_PROTOCOL_LEVEL < 3) // older versions didn't suback
+	break;
+
+      // Check for SUBACK if using MQTT 3.1.1 or higher
+      // TODO: The Server is permitted to start sending PUBLISH packets matching the
+      // Subscription before the Server sends the SUBACK Packet. (will really need to use callbacks - ada)
+
+      len = processPacketsUntil(buffer, MQTT_CTRL_SUBACK, CONNECT_TIMEOUT_MS);
+      if ((len != 5) || (buffer[0] != (MQTT_CTRL_SUBACK << 4))) {
+	continue; // retry!
+      }
+      success = true;
+    }
+    if (! success) return -2; // failed to sub for some reason
   }
 
   return 0;
 }
 
+uint16_t Adafruit_MQTT::processPacketsUntil(uint8_t *buffer, uint8_t waitforpackettype, uint16_t timeout) {
+  uint16_t len;
+  while (len = readFullPacket(buffer, timeout)) {
+
+    //DEBUG_PRINT("Packet read size: "); DEBUG_PRINTLN(len);
+    // TODO: add subscription reading & call back processing here
+
+    if ((buffer[0] >> 4) == waitforpackettype) {
+      //DEBUG_PRINTLN(F("Found right packet")); 
+      return len;
+    }
+  }
+  return 0;
+}
+
+uint16_t Adafruit_MQTT::readFullPacket(uint8_t *buffer, uint16_t timeout) {
+  // will read a packet and Do The Right Thing with length
+  uint8_t *pbuff = buffer;
+
+  uint8_t rlen;
+
+  // read the packet type:
+  rlen = readPacket(pbuff, 1, timeout);
+  if (rlen != 1) return 0;
+
+  DEBUG_PRINT(F("Packet Type:\t")); DEBUG_PRINTBUFFER(pbuff, rlen);
+  pbuff++;
+
+  uint32_t value = 0;
+  uint32_t multiplier = 1;
+  uint8_t encodedByte;
+
+  do {
+    rlen = readPacket(pbuff, 1, timeout);
+    if (rlen != 1) return 0;
+    encodedByte = pbuff[0]; // save the last read val
+    pbuff++; // get ready for reading the next byte
+    uint32_t intermediate = encodedByte & 0x7F;
+    intermediate *= multiplier;
+    value += intermediate;
+    multiplier *= 128;
+    if (multiplier > (128UL*128UL*128UL)) {
+      DEBUG_PRINT(F("Malformed packet len\n"));
+      return 0;
+    }
+  } while (encodedByte & 0x80);
+
+  DEBUG_PRINT(F("Packet Length:\t")); DEBUG_PRINTLN(value);
+  
+  rlen = readPacket(pbuff, value, timeout);
+  //DEBUG_PRINT(F("Remaining packet:\t")); DEBUG_PRINTBUFFER(pbuff, rlen);
+
+  return ((pbuff - buffer)+rlen);
+}
+
 const __FlashStringHelper* Adafruit_MQTT::connectErrorString(int8_t code) {
    switch (code) {
-      case 1: return F("Wrong protocol");
-      case 2: return F("ID rejected");
-      case 3: return F("Server unavail");
-      case 4: return F("Bad user/pass");
-      case 5: return F("Not authed");
-      case 6: return F("Failed to subscribe");
+      case 1: return F("The Server does not support the level of the MQTT protocol requested");
+      case 2: return F("The Client identifier is correct UTF-8 but not allowed by the Server");
+      case 3: return F("The MQTT service is unavailable");
+      case 4: return F("The data in the user name or password is malformed");
+      case 5: return F("Not authorized to connect");
+      case 6: return F("Exceeded reconnect rate limit. Please try again later.");
+      case 7: return F("You have been banned from connecting. Please contact the MQTT server administrator for more details.");
       case -1: return F("Connection failed");
+      case -2: return F("Failed to subscribe");
       default: return F("Unknown error");
    }
 }
@@ -230,17 +311,32 @@ bool Adafruit_MQTT::disconnect() {
 
 
 bool Adafruit_MQTT::publish(const char *topic, const char *data, uint8_t qos) {
+    return publish(topic, (uint8_t*)(data), strlen(data), qos);
+}
+
+bool Adafruit_MQTT::publish(const char *topic, uint8_t *data, uint8_t bLen, uint8_t qos) {
   // Construct and send publish packet.
-  uint8_t len = publishPacket(buffer, topic, data, qos);
+  uint8_t len = publishPacket(buffer, topic, data, bLen, qos);
   if (!sendPacket(buffer, len))
     return false;
 
   // If QOS level is high enough verify the response packet.
   if (qos > 0) {
-    len = readPacket(buffer, 4, PUBLISH_TIMEOUT_MS);
+    len = readFullPacket(buffer, PUBLISH_TIMEOUT_MS);
     DEBUG_PRINT(F("Publish QOS1+ reply:\t"));
     DEBUG_PRINTBUFFER(buffer, len);
-    //TODO: Verify response packet?
+    if (len != 4)
+      return false;
+    if ((buffer[0] >> 4) != MQTT_CTRL_PUBACK)
+      return false;
+    uint16_t packnum = buffer[2];
+    packnum <<= 8;
+    packnum |= buffer[3];
+
+    // we increment the packet_id_counter right after publishing so inc here too to match
+    packnum++;
+    if (packnum != packet_id_counter)
+      return false;
   }
 
   return true;
@@ -307,19 +403,17 @@ bool Adafruit_MQTT::unsubscribe(Adafruit_MQTT_Subscribe *sub) {
       if(subscriptions[i]->qos > 0 && MQTT_PROTOCOL_LEVEL > 3) {
 
         // wait for UNSUBACK
-        len = readPacket(buffer, 5, CONNECT_TIMEOUT_MS);
+        len = readFullPacket(buffer, CONNECT_TIMEOUT_MS);
         DEBUG_PRINT(F("UNSUBACK:\t"));
         DEBUG_PRINTBUFFER(buffer, len);
 
         if ((len != 5) || (buffer[0] != (MQTT_CTRL_UNSUBACK << 4))) {
           return false;  // failure to unsubscribe
         }
-
       }
 
       subscriptions[i] = 0;
       return true;
-
     }
 
   }
@@ -333,9 +427,10 @@ Adafruit_MQTT_Subscribe *Adafruit_MQTT::readSubscription(int16_t timeout) {
   uint8_t i, topiclen, datalen;
 
   // Check if data is available to read.
-  uint16_t len = readPacket(buffer, MAXBUFFERSIZE, timeout, true); // return one full packet
+  uint16_t len = readFullPacket(buffer, timeout); // return one full packet
   if (!len)
     return NULL;  // No data available, just quit.
+  DEBUG_PRINT("Packet len: "); DEBUG_PRINTLN(len); 
   DEBUG_PRINTBUFFER(buffer, len);
 
   // Parse out length of packet.
@@ -359,19 +454,38 @@ Adafruit_MQTT_Subscribe *Adafruit_MQTT::readSubscription(int16_t timeout) {
   }
   if (i==MAXSUBSCRIPTIONS) return NULL; // matching sub not found ???
 
+  uint8_t packet_id_len = 0;
+  uint16_t packetid;
+  // Check if it is QoS 1, TODO: we dont support QoS 2
+  if ((buffer[0] & 0x6) == 0x2) {
+    packet_id_len = 2;
+    packetid = buffer[topiclen+4];
+    packetid <<= 8;
+    packetid |= buffer[topiclen+5];
+  }
+
   // zero out the old data
   memset(subscriptions[i]->lastread, 0, SUBSCRIPTIONDATALEN);
 
-  datalen = len - topiclen - 4;
+  datalen = len - topiclen - packet_id_len - 4;
   if (datalen > SUBSCRIPTIONDATALEN) {
     datalen = SUBSCRIPTIONDATALEN-1; // cut it off
   }
   // extract out just the data, into the subscription object itself
-  memcpy(subscriptions[i]->lastread, buffer+4+topiclen, datalen);
+  memmove(subscriptions[i]->lastread, buffer+4+topiclen+packet_id_len, datalen);
   subscriptions[i]->datalen = datalen;
   DEBUG_PRINT(F("Data len: ")); DEBUG_PRINTLN(datalen);
   DEBUG_PRINT(F("Data: ")); DEBUG_PRINTLN((char *)subscriptions[i]->lastread);
 
+  if ((MQTT_PROTOCOL_LEVEL > 3) &&(buffer[0] & 0x6) == 0x2) {
+    uint8_t ackpacket[4];
+    
+    // Construct and send puback packet.
+    uint8_t len = pubackPacket(ackpacket, packetid);
+    if (!sendPacket(ackpacket, len))
+      DEBUG_PRINT(F("Failed"));
+  }
+
   // return the valid matching subscription
   return subscriptions[i];
 }
@@ -383,20 +497,20 @@ void Adafruit_MQTT::flushIncoming(uint16_t timeout) {
 }
 
 bool Adafruit_MQTT::ping(uint8_t num) {
-  flushIncoming(100);
+  //flushIncoming(100);
 
   while (num--) {
     // Construct and send ping packet.
     uint8_t len = pingPacket(buffer);
     if (!sendPacket(buffer, len))
       continue;
-    
+
     // Process ping reply.
-    len = readPacket(buffer, 2, PING_TIMEOUT_MS);
+    len = processPacketsUntil(buffer, MQTT_CTRL_PINGRESP, PING_TIMEOUT_MS);
     if (buffer[0] == (MQTT_CTRL_PINGRESP << 4))
       return true;
   }
-    
+
   return false;
 }
 
@@ -490,8 +604,10 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
   return len;
 }
 
-uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic, 
-                                     const char *data, uint8_t qos) {
+
+// as per http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718040
+uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
+                                     uint8_t *data, uint8_t bLen, uint8_t qos) {
   uint8_t *p = packet;
   uint16_t len;
 
@@ -499,6 +615,9 @@ uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
   // fill in packet[1] last
   p+=2;
 
+  // topic comes before packet identifier
+  p = stringprint_P(p, topic);
+
   // add packet identifier. used for checking PUBACK in QOS > 0
   if(qos > 0) {
     p[0] = (packet_id_counter >> 8) & 0xFF;
@@ -509,18 +628,17 @@ uint8_t Adafruit_MQTT::publishPacket(uint8_t *packet, const char *topic,
     packet_id_counter++;
   }
 
-  p = stringprint_P(p, topic);
-
-  memcpy(p, data, strlen(data));
-  p+=strlen(data);
+  memmove(p, data, bLen);
+  p+= bLen;
   len = p - packet;
   packet[1] = len-2; // don't include the 2 bytes of fixed header data
   DEBUG_PRINTLN(F("MQTT publish packet:"));
   DEBUG_PRINTBUFFER(buffer, len);
   return len;
+
 }
 
-uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic, 
+uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
                                        uint8_t qos) {
   uint8_t *p = packet;
   uint16_t len;
@@ -549,6 +667,8 @@ uint8_t Adafruit_MQTT::subscribePacket(uint8_t *packet, const char *topic,
   return len;
 }
 
+
+
 uint8_t Adafruit_MQTT::unsubscribePacket(uint8_t *packet, const char *topic) {
 
   uint8_t *p = packet;
@@ -584,6 +704,16 @@ uint8_t Adafruit_MQTT::pingPacket(uint8_t *packet) {
   return 2;
 }
 
+uint8_t Adafruit_MQTT::pubackPacket(uint8_t *packet, uint16_t packetid) {
+  packet[0] = MQTT_CTRL_PUBACK << 4;
+  packet[1] = 2;
+  packet[2] = packetid >> 8;
+  packet[3] = packetid;
+  DEBUG_PRINTLN(F("MQTT puback packet:"));
+  DEBUG_PRINTBUFFER(buffer, 4);
+  return 4;
+}
+
 uint8_t Adafruit_MQTT::disconnectPacket(uint8_t *packet) {
   packet[0] = MQTT_CTRL_DISCONNECT << 4;
   packet[1] = 0;
@@ -594,7 +724,7 @@ uint8_t Adafruit_MQTT::disconnectPacket(uint8_t *packet) {
 
 // Adafruit_MQTT_Publish Definition ////////////////////////////////////////////
 
-Adafruit_MQTT_Publish::Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver, 
+Adafruit_MQTT_Publish::Adafruit_MQTT_Publish(Adafruit_MQTT *mqttserver,
                                              const char *feed, uint8_t q) {
   mqtt = mqttserver;
   topic = feed;
@@ -630,14 +760,22 @@ bool Adafruit_MQTT_Publish::publish(const char *payload) {
   return mqtt->publish(topic, payload, qos);
 }
 
+//publish buffer of arbitrary length
+bool Adafruit_MQTT_Publish::publish(uint8_t *payload, uint8_t bLen) {
+
+  return mqtt->publish(topic, payload, bLen, qos);
+}
+
 
 // Adafruit_MQTT_Subscribe Definition //////////////////////////////////////////
 
-Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver, 
+Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver,
                                                  const char *feed, uint8_t q) {
   mqtt = mqttserver;
   topic = feed;
   qos = q;
+  datalen = 0;
+  callback = 0;
 }
 
 Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver,
@@ -645,4 +783,14 @@ Adafruit_MQTT_Subscribe::Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver,
   mqtt = mqttserver;
   topic = (const char *)feed;
   qos = q;
+  datalen = 0;
+  callback = 0;
+}
+
+void Adafruit_MQTT_Subscribe::setCallback(SubscribeCallbackType cb) {
+  callback = cb;
+}
+
+void Adafruit_MQTT_Subscribe::removeCallback(void) {
+  callback = 0;
 }
diff --git a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.h b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.h
index d19bfac..bd320b7 100644
--- a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.h
+++ b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT.h
@@ -24,7 +24,7 @@
 
 #include "Arduino.h"
 
-#ifdef ARDUINO_SAMD_ZERO
+#if defined(ARDUINO_SAMD_ZERO) || defined(ARDUINO_STM32_FEATHER)
 #define strncpy_P(dest, src, len) strncpy((dest), (src), (len))
 #define strncasecmp_P(f1, f2, len) strncasecmp((f1), (f2), (len))
 #endif
@@ -68,7 +68,7 @@
 #define MQTT_QOS_1 0x1
 #define MQTT_QOS_0 0x0
 
-#define CONNECT_TIMEOUT_MS 3000
+#define CONNECT_TIMEOUT_MS 6000
 #define PUBLISH_TIMEOUT_MS 500
 #define PING_TIMEOUT_MS    500
 
@@ -95,6 +95,9 @@
 // eg max-subscription-payload-size
 #define SUBSCRIPTIONDATALEN 20
 
+//Function pointer called CallbackType that takes a float
+//and returns an int
+typedef void (*SubscribeCallbackType)(char *);  
 
 extern void printBuffer(uint8_t *buffer, uint8_t len);
 
@@ -160,6 +163,7 @@ class Adafruit_MQTT {
   // The topic must be stored in PROGMEM. It can either be a
   // char*, or a __FlashStringHelper* (the result of the F() macro).
   bool publish(const char *topic, const char *payload, uint8_t qos = 0);
+  bool publish(const char *topic, uint8_t *payload, uint8_t bLen, uint8_t qos = 0);
   bool publish(const __FlashStringHelper *topic, const char *payload, uint8_t qos = 0) {
     return publish((const char *)topic, payload, qos);
   }
@@ -196,10 +200,13 @@ class Adafruit_MQTT {
 
   // Read MQTT packet from the server.  Will read up to maxlen bytes and store
   // the data in the provided buffer.  Waits up to the specified timeout (in
-  // milliseconds) for data to be available.  If checkForValidPubPacket is true
-  // then the received data is verified to make sure it's a complete packet.
-  virtual uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
-                              bool checkForValidPubPacket = false) = 0;
+  // milliseconds) for data to be available. 
+  virtual uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout) = 0;
+
+  // Read a full packet, keeping note of the correct length
+  uint16_t readFullPacket(uint8_t *buffer, uint16_t timeout);
+  // Properly process packets until you get to one you want
+  uint16_t processPacketsUntil(uint8_t *buffer, uint8_t waitforpackettype, uint16_t timeout);
 
   // Shared state that subclasses can use:
   const char *servername;
@@ -222,10 +229,11 @@ class Adafruit_MQTT {
   // Functions to generate MQTT packets.
   uint8_t connectPacket(uint8_t *packet);
   uint8_t disconnectPacket(uint8_t *packet);
-  uint8_t publishPacket(uint8_t *packet, const char *topic, const char *payload, uint8_t qos);
+  uint8_t publishPacket(uint8_t *packet, const char *topic, uint8_t *payload, uint8_t bLen, uint8_t qos);
   uint8_t subscribePacket(uint8_t *packet, const char *topic, uint8_t qos);
   uint8_t unsubscribePacket(uint8_t *packet, const char *topic);
   uint8_t pingPacket(uint8_t *packet);
+  uint8_t pubackPacket(uint8_t *packet, uint16_t packetid);
 };
 
 
@@ -239,6 +247,8 @@ class Adafruit_MQTT_Publish {
                                                 // This might be ignored and a higher precision value sent.
   bool publish(int32_t i);
   bool publish(uint32_t i);
+  bool publish(uint8_t *b, uint8_t bLen);
+
 
 private:
   Adafruit_MQTT *mqtt;
@@ -251,7 +261,8 @@ class Adafruit_MQTT_Subscribe {
   Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver, const char *feedname, uint8_t q=0);
   Adafruit_MQTT_Subscribe(Adafruit_MQTT *mqttserver, const __FlashStringHelper *feedname, uint8_t q=0);
 
-  bool setCallback(void (*callback)(char *));
+  void setCallback(SubscribeCallbackType callb);
+  void removeCallback(void);
 
   const char *topic;
   uint8_t qos;
@@ -261,6 +272,7 @@ class Adafruit_MQTT_Subscribe {
   // ensure nul terminating lastread.
   uint8_t datalen;
  private:
+  SubscribeCallbackType callback;
   Adafruit_MQTT *mqtt;
 };
 
diff --git a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_CC3000.h b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_CC3000.h
index 277a0fb..ec6bf37 100644
--- a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_CC3000.h
+++ b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_CC3000.h
@@ -100,8 +100,7 @@ class Adafruit_MQTT_CC3000 : public Adafruit_MQTT {
     return mqttclient.connected();
   }
 
-  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
-                      bool checkForValidPubPacket = false) {
+  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout) {
     /* Read data until either the connection is closed, or the idle timeout is reached. */
     uint16_t len = 0;
     int16_t t = timeout;
@@ -120,16 +119,6 @@ class Adafruit_MQTT_CC3000 : public Adafruit_MQTT {
           DEBUG_PRINTBUFFER(buffer, len);
           return len;
         }
-
-        // special case where we just one one publication packet at a time
-        if (checkForValidPubPacket) {
-          if ((buffer[0] == (MQTT_CTRL_PUBLISH << 4)) && (buffer[1] == len-2)) {
-            // oooh a valid publish packet!
-            DEBUG_PRINT(F("Read PUBLISH packet:\t"));
-            DEBUG_PRINTBUFFER(buffer, len);
-            return len;
-          }
-        }
       }
       Watchdog.reset();
       timeout -= MQTT_CC3000_INTERAVAILDELAY;
diff --git a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.cpp b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.cpp
index 6612c8f..81f9652 100644
--- a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.cpp
+++ b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.cpp
@@ -48,8 +48,7 @@ bool Adafruit_MQTT_Client::connected() {
 }
 
 uint16_t Adafruit_MQTT_Client::readPacket(uint8_t *buffer, uint8_t maxlen,
-                                          int16_t timeout,
-                                          bool checkForValidPubPacket) {
+                                          int16_t timeout) {
   /* Read data until either the connection is closed, or the idle timeout is reached. */
   uint16_t len = 0;
   int16_t t = timeout;
@@ -64,20 +63,10 @@ uint16_t Adafruit_MQTT_Client::readPacket(uint8_t *buffer, uint8_t maxlen,
       //DEBUG_PRINTLN((uint8_t)c, HEX);
       len++;
       if (len == maxlen) {  // we read all we want, bail
-        DEBUG_PRINT(F("Read packet:\t"));
+        DEBUG_PRINT(F("Read data:\t"));
         DEBUG_PRINTBUFFER(buffer, len);
         return len;
       }
-
-      // special case where we just one one publication packet at a time
-      if (checkForValidPubPacket) {
-        if ((buffer[0] == (MQTT_CTRL_PUBLISH << 4)) && (buffer[1] == len-2)) {
-          // oooh a valid publish packet!
-          DEBUG_PRINT(F("Read PUBLISH packet:\t"));
-          DEBUG_PRINTBUFFER(buffer, len);
-          return len;
-        }
-      }
     }
     timeout -= MQTT_CLIENT_READINTERVAL_MS;
     delay(MQTT_CLIENT_READINTERVAL_MS);
diff --git a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.h b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.h
index c9b4366..db1216a 100644
--- a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.h
+++ b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_Client.h
@@ -50,8 +50,7 @@ class Adafruit_MQTT_Client : public Adafruit_MQTT {
   bool connectServer();
   bool disconnectServer();
   bool connected();
-  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
-                      bool checkForValidPubPacket = false);
+  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout);
   bool sendPacket(uint8_t *buffer, uint8_t len);
 
  private:
diff --git a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_FONA.h b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_FONA.h
index a65b99d..920c217 100644
--- a/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_FONA.h
+++ b/libraries/Adafruit_MQTT_Library/Adafruit_MQTT_FONA.h
@@ -50,7 +50,9 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
   bool connectServer() {
     char server[40];
     strncpy_P(server, servername, 40);
+#ifdef ADAFRUIT_SLEEPYDOG_H
     Watchdog.reset();
+#endif
 
     // connect to server
     DEBUG_PRINTLN(F("Connecting to TCP"));
@@ -66,10 +68,9 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
     return fona->TCPconnected();
   }
 
-  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout,
-                      bool checkForValidPubPacket = false) {
+  uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout) {
     uint8_t *buffp = buffer;
-    DEBUG_PRINTLN(F("Reading a packet.."));
+    DEBUG_PRINTLN(F("Reading data.."));
 
     if (!fona->TCPconnected()) return 0;
 
@@ -80,9 +81,9 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
     uint16_t avail;
 
     while (fona->TCPconnected() && (timeout >= 0)) {
-      DEBUG_PRINT('.');
+      //DEBUG_PRINT('.');
       while (avail = fona->TCPavailable()) {
-        DEBUG_PRINT('!');
+        //DEBUG_PRINT('!');
 
         if (len + avail > maxlen) {
 	  avail = maxlen - len;
@@ -100,28 +101,19 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT {
         //DEBUG_PRINTLN((uint8_t)c, HEX);
 
         if (len == maxlen) {  // we read all we want, bail
-          DEBUG_PRINT(F("Read packet:\t"));
+          DEBUG_PRINT(F("Read:\t"));
           DEBUG_PRINTBUFFER(buffer, len);
-    return len;
-        }
-
-        // special case where we just one one publication packet at a time
-        if (checkForValidPubPacket) {
-          if ((buffer[0] == (MQTT_CTRL_PUBLISH << 4)) && (buffer[1] == len-2)) {
-            // oooh a valid publish packet!
-            DEBUG_PRINT(F("Read PUBLISH packet:\t"));
-            DEBUG_PRINTBUFFER(buffer, len);
-            return len;
-          }
+	  return len;
         }
-
       }
+#ifdef ADAFRUIT_SLEEPYDOG_H
       Watchdog.reset();
+#endif
       timeout -= MQTT_FONA_INTERAVAILDELAY;
       timeout -= MQTT_FONA_QUERYDELAY; // this is how long it takes to query the FONA for avail()
       delay(MQTT_FONA_INTERAVAILDELAY);
     }
-
+    
     return len;
   }
 
diff --git a/libraries/Adafruit_MQTT_Library/README.md b/libraries/Adafruit_MQTT_Library/README.md
index 35f6b18..461ebfa 100644
--- a/libraries/Adafruit_MQTT_Library/README.md
+++ b/libraries/Adafruit_MQTT_Library/README.md
@@ -24,3 +24,35 @@ Future todos:
    - Subscription callbacks
 
    - remove watchdog
+
+<!-- START COMPATIBILITY TABLE -->
+
+## Compatibility
+
+MCU                | Tested Works | Doesn't Work | Not Tested  | Notes
+------------------ | :----------: | :----------: | :---------: | -----
+Atmega328 @ 16MHz  |             |             |     X       | 
+Atmega328 @ 12MHz  |             |             |     X       | 
+Atmega32u4 @ 16MHz |             |             |     X       | 
+Atmega32u4 @ 8MHz  |             |             |     X       | 
+ESP8266            |             |             |     X       | 
+Atmega2560 @ 16MHz |             |             |     X       | 
+ATSAM3X8E          |             |             |     X       | 
+ATSAM21D           |             |             |     X       | 
+ATtiny85 @ 16MHz   |             |             |     X       | 
+ATtiny85 @ 8MHz    |             |             |     X       | 
+Intel Curie @ 32MHz |             |             |     X       | 
+STM32F2            |             |             |     X       | 
+
+  * ATmega328 @ 16MHz : Arduino UNO, Adafruit Pro Trinket 5V, Adafruit Metro 328, Adafruit Metro Mini
+  * ATmega328 @ 12MHz : Adafruit Pro Trinket 3V
+  * ATmega32u4 @ 16MHz : Arduino Leonardo, Arduino Micro, Arduino Yun, Teensy 2.0
+  * ATmega32u4 @ 8MHz : Adafruit Flora, Bluefruit Micro
+  * ESP8266 : Adafruit Huzzah
+  * ATmega2560 @ 16MHz : Arduino Mega
+  * ATSAM3X8E : Arduino Due
+  * ATSAM21D : Arduino Zero, M0 Pro
+  * ATtiny85 @ 16MHz : Adafruit Trinket 5V
+  * ATtiny85 @ 8MHz : Adafruit Gemma, Arduino Gemma, Adafruit Trinket 3V
+
+<!-- END COMPATIBILITY TABLE -->
diff --git a/libraries/Adafruit_MQTT_Library/examples/adafruitio_errors_esp8266/adafruitio_errors_esp8266.ino b/libraries/Adafruit_MQTT_Library/examples/adafruitio_errors_esp8266/adafruitio_errors_esp8266.ino
new file mode 100644
index 0000000..ce43b78
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/adafruitio_errors_esp8266/adafruitio_errors_esp8266.ino
@@ -0,0 +1,166 @@
+/***************************************************
+  Adafruit MQTT Library ESP8266 Example
+
+  Must use ESP8266 Arduino from:
+    https://github.com/esp8266/Arduino
+
+  Works great with Adafruit's Huzzah ESP board & Feather
+  ----> https://www.adafruit.com/product/2471
+  ----> https://www.adafruit.com/products/2821
+
+  Adafruit invests time and resources providing this open source code,
+  please support Adafruit and open-source hardware by purchasing
+  products from Adafruit!
+
+  Written by Tony DiCola for Adafruit Industries.
+  Error examples by Todd Treece for Adafruit Industries.
+  MIT license, all text above must be included in any redistribution
+ ****************************************************/
+#include <ESP8266WiFi.h>
+#include "Adafruit_MQTT.h"
+#include "Adafruit_MQTT_Client.h"
+
+/************************* WiFi Access Point *********************************/
+
+#define WLAN_SSID       "...your SSID..."
+#define WLAN_PASS       "...your password..."
+
+/************************* Adafruit.io Setup *********************************/
+
+#define AIO_SERVER      "io.adafruit.com"
+#define AIO_SERVERPORT  1883                   // 8883 for MQTTS
+#define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
+#define AIO_KEY         "...your AIO key..."
+
+/************ Global State (you don't need to change this!) ******************/
+
+// Create an ESP8266 WiFiClient class to connect to the MQTT server.
+WiFiClient client;
+// or... use WiFiFlientSecure for SSL
+//WiFiClientSecure client;
+
+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
+// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);
+
+/****************************** Feeds ***************************************/
+
+// Setup a feed called 'photocell' for publishing.
+// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);
+
+// Setup a feed called 'onoff' for subscribing to changes.
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);
+
+/*************************** Error Reporting *********************************/
+
+const char ERROR_FEED[] PROGMEM = AIO_USERNAME "/errors";
+Adafruit_MQTT_Subscribe errors = Adafruit_MQTT_Subscribe(&mqtt, ERROR_FEED);
+
+const char THROTTLE_FEED[] PROGMEM = AIO_USERNAME "/throttle";
+Adafruit_MQTT_Subscribe throttle = Adafruit_MQTT_Subscribe(&mqtt, THROTTLE_FEED);
+
+/*************************** Sketch Code ************************************/
+
+// Bug workaround for Arduino 1.6.6, it seems to need a function declaration
+// for some reason (only affects ESP8266, likely an arduino-builder bug).
+void MQTT_connect();
+
+void setup() {
+  Serial.begin(115200);
+  delay(10);
+
+  Serial.println(F("Adafruit MQTT demo"));
+
+  // Connect to WiFi access point.
+  Serial.println(); Serial.println();
+  Serial.print("Connecting to ");
+  Serial.println(WLAN_SSID);
+
+  WiFi.begin(WLAN_SSID, WLAN_PASS);
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(".");
+  }
+  Serial.println();
+
+  Serial.println("WiFi connected");
+  Serial.println("IP address: "); Serial.println(WiFi.localIP());
+
+  // Setup MQTT subscription for onoff feed
+  mqtt.subscribe(&onoffbutton);
+
+  // Setup MQTT subscriptions for throttle & error messages
+  mqtt.subscribe(&throttle);
+  mqtt.subscribe(&errors);
+
+}
+
+uint32_t x=0;
+
+void loop() {
+  // Ensure the connection to the MQTT server is alive (this will make the first
+  // connection and automatically reconnect when disconnected).  See the MQTT_connect
+  // function definition further below.
+  MQTT_connect();
+
+  // this is our 'wait for incoming subscription packets' busy subloop
+  // try to spend your time here
+  Adafruit_MQTT_Subscribe *subscription;
+  while ((subscription = mqtt.readSubscription(5000))) {
+    if (subscription == &onoffbutton) {
+      Serial.print(F("Got onoff: "));
+      Serial.println((char *)onoffbutton.lastread);
+    } else if(subscription == &errors) {
+      Serial.print(F("ERROR: "));
+      Serial.println((char *)errors.lastread);
+    } else if(subscription == &throttle) {
+      Serial.println((char *)throttle.lastread);
+    }
+  }
+
+  // Now we can publish stuff!
+  Serial.print(F("\nSending photocell val "));
+  Serial.print(x);
+  Serial.print("...");
+  if (! photocell.publish(x++)) {
+    Serial.println(F("Failed"));
+  } else {
+    Serial.println(F("OK!"));
+  }
+
+}
+
+// Function to connect and reconnect as necessary to the MQTT server.
+// Should be called in the loop function and it will take care if connecting.
+void MQTT_connect() {
+  int8_t ret;
+
+  // Stop if already connected.
+  if (mqtt.connected()) {
+    return;
+  }
+
+  Serial.print("Connecting to MQTT... ");
+
+  uint8_t retries = 3;
+  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
+       Serial.println(mqtt.connectErrorString(ret));
+       Serial.println("Retrying MQTT connection in 5 seconds...");
+       mqtt.disconnect();
+       delay(5000);  // wait 5 seconds
+       retries--;
+       if (retries == 0) {
+         // basically die and wait for WDT to reset me
+         while (1);
+       }
+  }
+  Serial.println("MQTT Connected!");
+}
diff --git a/libraries/Adafruit_MQTT_Library/examples/adafruitio_secure_esp8266/adafruitio_secure_esp8266.ino b/libraries/Adafruit_MQTT_Library/examples/adafruitio_secure_esp8266/adafruitio_secure_esp8266.ino
new file mode 100644
index 0000000..1468fd1
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/adafruitio_secure_esp8266/adafruitio_secure_esp8266.ino
@@ -0,0 +1,167 @@
+/***************************************************
+  Adafruit MQTT Library ESP8266 Adafruit IO SSL/TLS example
+
+  Must use the latest version of ESP8266 Arduino from:
+    https://github.com/esp8266/Arduino
+
+  Works great with Adafruit's Huzzah ESP board & Feather
+  ----> https://www.adafruit.com/product/2471
+  ----> https://www.adafruit.com/products/2821
+
+  Adafruit invests time and resources providing this open source code,
+  please support Adafruit and open-source hardware by purchasing
+  products from Adafruit!
+
+  Written by Tony DiCola for Adafruit Industries.
+  SSL/TLS additions by Todd Treece for Adafruit Industries.
+  MIT license, all text above must be included in any redistribution
+ ****************************************************/
+#include <ESP8266WiFi.h>
+#include "Adafruit_MQTT.h"
+#include "Adafruit_MQTT_Client.h"
+
+/************************* WiFi Access Point *********************************/
+
+#define WLAN_SSID       "...your SSID..."
+#define WLAN_PASS       "...your password..."
+
+/************************* Adafruit.io Setup *********************************/
+
+#define AIO_SERVER      "io.adafruit.com"
+#define AIO_SERVERPORT  8883                   // 8883 for MQTTS
+#define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
+#define AIO_KEY         "...your AIO key..."
+
+/************ Global State (you don't need to change this!) ******************/
+
+// WiFiFlientSecure for SSL/TLS support
+WiFiClientSecure client;
+
+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
+// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);
+
+// io.adafruit.com SHA1 fingerprint
+const char* fingerprint = "26 96 1C 2A 51 07 FD 15 80 96 93 AE F7 32 CE B9 0D 01 55 C4";
+
+/****************************** Feeds ***************************************/
+
+// Setup a feed called 'photocell' for publishing.
+// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
+const char TEST_FEED[] PROGMEM = AIO_USERNAME "/feeds/test";
+Adafruit_MQTT_Publish test = Adafruit_MQTT_Publish(&mqtt, TEST_FEED);
+
+/*************************** Sketch Code ************************************/
+
+// Bug workaround for Arduino 1.6.6, it seems to need a function declaration
+// for some reason (only affects ESP8266, likely an arduino-builder bug).
+void MQTT_connect();
+void verifyFingerprint();
+
+void setup() {
+  Serial.begin(115200);
+  delay(10);
+
+  Serial.println(F("Adafruit IO MQTTS (SSL/TLS) Example"));
+
+  // Connect to WiFi access point.
+  Serial.println(); Serial.println();
+  Serial.print("Connecting to ");
+  Serial.println(WLAN_SSID);
+
+  delay(1000);
+
+  WiFi.begin(WLAN_SSID, WLAN_PASS);
+  delay(2000);
+
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(".");
+  }
+  Serial.println();
+
+  Serial.println("WiFi connected");
+  Serial.println("IP address: "); Serial.println(WiFi.localIP());
+
+  // check the fingerprint of io.adafruit.com's SSL cert
+  verifyFingerprint();
+
+}
+
+uint32_t x=0;
+
+void loop() {
+  // Ensure the connection to the MQTT server is alive (this will make the first
+  // connection and automatically reconnect when disconnected).  See the MQTT_connect
+  // function definition further below.
+  MQTT_connect();
+
+  // Now we can publish stuff!
+  Serial.print(F("\nSending val "));
+  Serial.print(x);
+  Serial.print(F(" to test feed..."));
+  if (! test.publish(x++)) {
+    Serial.println(F("Failed"));
+  } else {
+    Serial.println(F("OK!"));
+  }
+
+  // wait a couple seconds to avoid rate limit
+  delay(2000);
+
+}
+
+
+void verifyFingerprint() {
+
+  const char* host = AIO_SERVER;
+
+  Serial.print("Connecting to ");
+  Serial.println(host);
+
+  if (! client.connect(host, AIO_SERVERPORT)) {
+    Serial.println("Connection failed. Halting execution.");
+    while(1);
+  }
+
+  if (client.verify(fingerprint, host)) {
+    Serial.println("Connection secure.");
+  } else {
+    Serial.println("Connection insecure! Halting execution.");
+    while(1);
+  }
+
+}
+
+// Function to connect and reconnect as necessary to the MQTT server.
+// Should be called in the loop function and it will take care if connecting.
+void MQTT_connect() {
+  int8_t ret;
+
+  // Stop if already connected.
+  if (mqtt.connected()) {
+    return;
+  }
+
+  Serial.print("Connecting to MQTT... ");
+
+  uint8_t retries = 3;
+  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
+       Serial.println(mqtt.connectErrorString(ret));
+       Serial.println("Retrying MQTT connection in 5 seconds...");
+       mqtt.disconnect();
+       delay(5000);  // wait 5 seconds
+       retries--;
+       if (retries == 0) {
+         // basically die and wait for WDT to reset me
+         while (1);
+       }
+  }
+
+  Serial.println("MQTT Connected!");
+}
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.due.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.due.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.leonardo.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.leonardo.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.uno.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.uno.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.zero.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/.zero.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/mqtt_2subs_esp8266.ino b/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/mqtt_2subs_esp8266.ino
new file mode 100644
index 0000000..c68ae9c
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_2subs_esp8266/mqtt_2subs_esp8266.ino
@@ -0,0 +1,166 @@
+/***************************************************
+  Adafruit MQTT Library ESP8266 Example
+
+  Must use ESP8266 Arduino from:
+    https://github.com/esp8266/Arduino
+
+  Works great with Adafruit's Huzzah ESP board & Feather
+  ----> https://www.adafruit.com/product/2471
+  ----> https://www.adafruit.com/products/2821
+
+  Adafruit invests time and resources providing this open source code,
+  please support Adafruit and open-source hardware by purchasing
+  products from Adafruit!
+
+  Written by Tony DiCola for Adafruit Industries.
+  MIT license, all text above must be included in any redistribution
+ ****************************************************/
+#include <ESP8266WiFi.h>
+#include "Adafruit_MQTT.h"
+#include "Adafruit_MQTT_Client.h"
+
+// the on off button feed turns this LED on/off
+#define LED 2  
+// the slider feed sets the PWM output of this pin
+#define PWMOUT 12
+
+/************************* WiFi Access Point *********************************/
+
+#define WLAN_SSID       "...your SSID..."
+#define WLAN_PASS       "...your password..."
+
+/************************* Adafruit.io Setup *********************************/
+
+#define AIO_SERVER      "io.adafruit.com"
+#define AIO_SERVERPORT  1883                   // use 8883 for SSL
+#define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
+#define AIO_KEY         "...your AIO key..."
+
+/************ Global State (you don't need to change this!) ******************/
+
+// Create an ESP8266 WiFiClient class to connect to the MQTT server.
+WiFiClient client;
+// or... use WiFiFlientSecure for SSL
+//WiFiClientSecure client;
+
+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
+// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);
+
+/****************************** Feeds ***************************************/
+
+// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
+// Setup a feed called 'onoff' for subscribing to changes.
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);
+const char SLIDER_FEED[] PROGMEM = AIO_USERNAME "/feeds/slider";
+Adafruit_MQTT_Subscribe slider = Adafruit_MQTT_Subscribe(&mqtt, SLIDER_FEED);
+
+/*************************** Sketch Code ************************************/
+
+// Bug workaround for Arduino 1.6.6, it seems to need a function declaration
+// for some reason (only affects ESP8266, likely an arduino-builder bug).
+void MQTT_connect();
+
+void setup() {
+  pinMode(LED, OUTPUT);
+  pinMode(PWMOUT, OUTPUT);
+
+  Serial.begin(115200);
+  delay(10);
+
+  Serial.println(F("Adafruit MQTT demo"));
+
+  // Connect to WiFi access point.
+  Serial.println(); Serial.println();
+  Serial.print("Connecting to ");
+  Serial.println(WLAN_SSID);
+
+  WiFi.begin(WLAN_SSID, WLAN_PASS);
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(".");
+  }
+  Serial.println();
+
+  Serial.println("WiFi connected");
+  Serial.println("IP address: "); Serial.println(WiFi.localIP());
+
+  // Setup MQTT subscription for onoff & slider feed.
+  mqtt.subscribe(&onoffbutton);
+  mqtt.subscribe(&slider);
+}
+
+uint32_t x=0;
+
+void loop() {
+  // Ensure the connection to the MQTT server is alive (this will make the first
+  // connection and automatically reconnect when disconnected).  See the MQTT_connect
+  // function definition further below.
+  MQTT_connect();
+
+  // this is our 'wait for incoming subscription packets' busy subloop
+  // try to spend your time here
+
+  Adafruit_MQTT_Subscribe *subscription;
+  while ((subscription = mqtt.readSubscription(5000))) {
+    // Check if its the onoff button feed
+    if (subscription == &onoffbutton) {
+      Serial.print(F("On-Off button: "));
+      Serial.println((char *)onoffbutton.lastread);
+      
+      if (strcmp((char *)onoffbutton.lastread, "ON") == 0) {
+        digitalWrite(LED, LOW); 
+      }
+      if (strcmp((char *)onoffbutton.lastread, "OFF") == 0) {
+        digitalWrite(LED, HIGH); 
+      }
+    }
+    
+    // check if its the slider feed
+    if (subscription == &slider) {
+      Serial.print(F("Slider: "));
+      Serial.println((char *)slider.lastread);
+      uint16_t sliderval = atoi((char *)slider.lastread);  // convert to a number
+      analogWrite(PWMOUT, sliderval);
+    }
+  }
+
+  // ping the server to keep the mqtt connection alive
+  if(! mqtt.ping()) {
+    mqtt.disconnect();
+  }
+
+}
+
+// Function to connect and reconnect as necessary to the MQTT server.
+// Should be called in the loop function and it will take care if connecting.
+void MQTT_connect() {
+  int8_t ret;
+
+  // Stop if already connected.
+  if (mqtt.connected()) {
+    return;
+  }
+
+  Serial.print("Connecting to MQTT... ");
+
+  uint8_t retries = 3;
+  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
+       Serial.println(mqtt.connectErrorString(ret));
+       Serial.println("Retrying MQTT connection in 5 seconds...");
+       mqtt.disconnect();
+       delay(5000);  // wait 5 seconds
+       retries--;
+       if (retries == 0) {
+         // basically die and wait for WDT to reset me
+         while (1);
+       }
+  }
+  Serial.println("MQTT Connected!");
+}
\ No newline at end of file
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.due.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.due.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.leonardo.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.leonardo.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.uno.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.uno.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.zero.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/.zero.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/README.md b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/README.md
new file mode 100644
index 0000000..66b765c
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/README.md
@@ -0,0 +1,108 @@
+# Adafruit MQTT Library Arbitrary Data Publish Example
+
+This example illustrates publishing an arbitrary data packet using the Adafruit MQTT library to an MQTT feed which can then be parsed by the included python subscriber client. Possible usage cases include adding metadata (collection time, sensor info etc) to a datapoint.
+
+![alt-text](https://raw.githubusercontent.com/stuthedew/Adafruit_MQTT_Library/Arbitrary_data_publish/examples/mqtt_arbitrary_data/python_subscriber/mqtt_figure.png "Arbitrary data flow diagram")
+
+My motivation for this was wanting to be able to include metadata to a post.
+Specifically, I was playing around with a [Teviso RD3024 radiation sensor](http://www.teviso.com/en/products/radiation-sensor-rd3024.htm), and a salvaged Americium radiation source from a smoke detector, at varying distances from the sensor. I wanted a way to associate the collection time, and distance between the source and sensor with the actual radiation reading itself.
+
+
+---
+
+## Installing and configuring Mosquitto broker (minimal working setup):
+
+####_Installing on Raspberry Pi/Linux:_
+
+```bash
+sudo apt-get install mosquitto
+cd /etc/mosquitto/
+#See "Configuring Mosquitto Broker below"
+```
+
+####_Installing On a Mac:_
+```bash
+brew install mosquitto
+cd /usr/local/etc/mosquitto
+#See "Configuring Mosquitto Broker below"
+```
+
+---
+
+####Configuring Mosquitto broker
+```bash
+sudo nano mosquitto.conf
+```
+Now we have to enable a password file to correctly interface with the Adafruit MQTT library. Scroll about two thirds of the way down until you see:
+
+```bash
+# -----------------------------------------------------------------
+# Default authentication and topic access control
+# -----------------------------------------------------------------
+```
+
+You should see `#password_file` about a paragraph after that.
+Change
+
+```bash
+#password_file
+```
+
+To
+
+```bash
+password_file pwfile
+```
+
+Now `ctrl-x` to save and exit.
+
+You're almost done! We just have to create and populate the password file we just configured. The default user info is:
+* **Arduino Subscriber:**
+    * Username: TestUser
+    * Password: TestUser
+
+* **Python Subscriber:**
+    * Username: TestPy
+    * Password: TestPy
+
+```bash
+touch pwfile #create the password file
+mosquitto_passwd pwfile TestUser #Enter and confirm password when prompted
+mosquitto_passwd pwfile TestPy #Enter and confirm password when prompted
+```
+
+####Running Mosquitto broker
+Now run Mosquitto broker to allow Arduino publisher and Python subscriber to communicate
+
+```bash
+mosquitto
+```
+
+---
+
+## Using Example Python Subscriber:
+
+####Installing Python subscriber
+Install dependencies if you haven't already
+```bash
+cd ../Adafruit_MQTT_Library/examples/mqtt_arbitrary_buffer/python_subscriber
+pip install -r requirements.txt
+```
+
+
+####Installing Python subscriber
+Run python script with default values and watch your parsed data print out.
+```bash
+python subscriber.py #Add -h flag to see modifiable options
+```
+
+Assuming that the Mosquitto broker is running in the background and the Adafruit_MQTT client (Arduino) is publishing, you should see the example data print out every 10 seconds.
+
+```bash
+MQTT:  Connection successful
+Connection successful
+Subscribed to /feeds/arb_packet
+Received char Array: "Hello!", val1: -4533, val2: 73102, val3: 3354...
+Received char Array: "Hello!", val1: -4533, val2: 83611, val3: 3354...
+Received char Array: "Hello!", val1: -4533, val2: 94115, val3: 3354...
+```
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/mqtt_arbitrary_data.ino b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/mqtt_arbitrary_data.ino
new file mode 100644
index 0000000..3d685e6
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/mqtt_arbitrary_data.ino
@@ -0,0 +1,190 @@
+/***************************************************
+  Adafruit MQTT Library Arbitrary Data Example
+
+  Must use ESP8266 Arduino from:
+    https://github.com/esp8266/Arduino
+
+  Works great with Adafruit's Huzzah ESP board & Feather
+  ----> https://www.adafruit.com/product/2471
+  ----> https://www.adafruit.com/products/2821
+
+  Adafruit invests time and resources providing this open source code,
+  please support Adafruit and open-source hardware by purchasing
+  products from Adafruit!
+
+  Written by Stuart Feichtinger
+  Modifed from the mqtt_esp8266 example written by Tony DiCola for Adafruit Industries.
+  MIT license, all text above must be included in any redistribution
+ ****************************************************/
+#include <ESP8266WiFi.h>
+#include "Adafruit_MQTT.h"
+#include "Adafruit_MQTT_Client.h"
+
+/************************* WiFi Access Point *********************************/
+
+#define WLAN_SSID       "...your SSID..."
+#define WLAN_PASS       "...your password..."
+
+/************************* Adafruit.io Setup *********************************/
+
+#define ARB_SERVER      "...host computer ip address..."
+#define ARB_SERVERPORT  1883                   // use 8883 for SSL
+#define ARB_USERNAME    "TestUser"
+#define ARB_PW         "TestUser"
+
+
+/************ Global State (you don't need to change this!) ******************/
+
+// Create an ESP8266 WiFiClient class to connect to the MQTT server.
+WiFiClient client;
+// or... use WiFiFlientSecure for SSL
+//WiFiClientSecure client;
+
+// Store the MQTT server, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = ARB_SERVER;
+const char MQTT_USERNAME[] PROGMEM  = ARB_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = ARB_PW;
+
+// Setup the MQTT client class by passing in the WiFi client and MQTT server and login details.
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, ARB_SERVERPORT, MQTT_USERNAME, MQTT_PASSWORD);
+
+/****************************** Feeds ***************************************/
+
+// Setup a feed called 'arb_packet' for publishing.
+// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
+const char ARB_FEED[] PROGMEM = "/feeds/arb_packet";
+Adafruit_MQTT_Publish ap = Adafruit_MQTT_Publish(&mqtt, ARB_FEED);
+
+
+// Arbitrary Payload
+// Union allows for easier interaction of members in struct form with easy publishing
+// of "raw" bytes
+typedef union{
+    //Customize struct with whatever variables/types you like.
+
+    struct __attribute__((__packed__)){  // packed to eliminate padding for easier parsing.
+        char charAry[10];
+        int16_t val1;
+        unsigned long val2;
+        uint16_t val3;
+    }s;
+
+    uint8_t raw[sizeof(s)];                    // For publishing
+
+    /*
+        // Alternate Option with anonymous struct, but manual byte count:
+
+        struct __attribute__((__packed__)){  // packed to eliminate padding for easier parsing.
+            char charAry[10];       // 10 x 1 byte  =   10 bytes
+            int16_t val1;           // 1 x  2 bytes =   2 bytes
+            unsigned long val2;     // 1 x  4 bytes =   4 bytes
+            uint16_t val3;          // 1 x  2 bytes =   2 bytes
+                                            -------------------
+                                            TOTAL =    18 bytes
+        };
+        uint8_t raw[18];                    // For publishing
+*/
+
+} packet_t;
+
+/*************************** Sketch Code ************************************/
+
+// Bug workaround for Arduino 1.6.6, it seems to need a function declaration
+// for some reason (only affects ESP8266, likely an arduino-builder bug).
+void MQTT_connect();
+
+void setup() {
+  Serial.begin(115200);
+  delay(10);
+
+  Serial.println(F("Adafruit MQTT demo"));
+
+  // Connect to WiFi access point.
+  Serial.println(); Serial.println();
+  Serial.print(F("Connecting to "));
+  Serial.println(WLAN_SSID);
+
+  WiFi.begin(WLAN_SSID, WLAN_PASS);
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(F("."));
+  }
+  Serial.println();
+
+  Serial.println(F("WiFi connected"));
+  Serial.println(F("IP address: ")); Serial.println(WiFi.localIP());
+
+}
+
+packet_t arbPac;
+
+const char strVal[] PROGMEM = "Hello!";
+
+void loop() {
+  // Ensure the connection to the MQTT server is alive (this will make the first
+  // connection and automatically reconnect when disconnected).  See the MQTT_connect
+  // function definition further below.
+  MQTT_connect();
+
+  //Update arbitrary packet values
+  strcpy_P(arbPac.s.charAry, strVal);
+  arbPac.s.val1 = -4533;
+  arbPac.s.val2 = millis();
+  arbPac.s.val3 = 3354;
+
+  /*
+   // Alternate Union with anonymous struct
+   // (see union declaration above)
+
+     strcpy_P(arbPac.charAry, strVal);
+     arbPac.val1 = -4533;
+     arbPac.val2 = millis();
+     arbPac.val3 = 3354;
+  */
+
+  if (! ap.publish(arbPac.raw, sizeof(packet_t)))
+        Serial.println(F("Publish Failed."));
+      else {
+        Serial.println(F("Publish Success!"));
+        delay(500);
+      }
+
+      delay(10000);
+
+
+  // ping the server to keep the mqtt connection alive
+  // NOT required if you are publishing once every KEEPALIVE seconds
+  /*
+  if(! mqtt.ping()) {
+    mqtt.disconnect();
+  }
+  */
+}
+
+// Function to connect and reconnect as necessary to the MQTT server.
+// Should be called in the loop function and it will take care if connecting.
+void MQTT_connect() {
+  int8_t ret;
+
+  // Stop if already connected.
+  if (mqtt.connected()) {
+    return;
+  }
+
+  Serial.print(F("Connecting to MQTT... "));
+
+  uint8_t retries = 3;
+  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
+       Serial.println(mqtt.connectErrorString(ret));
+       Serial.println(F("Retrying MQTT connection in 5 seconds..."));
+       mqtt.disconnect();
+       delay(5000);  // wait 5 seconds
+       retries--;
+       if (retries == 0) {
+         // basically die and wait for WDT to reset me
+         while (1);
+       }
+  }
+  Serial.println(F("MQTT Connected!"));
+}
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/mqtt_figure.png b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/mqtt_figure.png
new file mode 100644
index 0000000..e0fd075
Binary files /dev/null and b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/mqtt_figure.png differ
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/requirements.txt b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/requirements.txt
new file mode 100644
index 0000000..4e5c670
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/requirements.txt
@@ -0,0 +1 @@
+paho-mqtt>=1.1
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/subscriber.py b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/subscriber.py
new file mode 100644
index 0000000..b93bdc8
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_arbitrary_data/python_subscriber/subscriber.py
@@ -0,0 +1,114 @@
+'''MQTT subscriber for Adafruit MQTT library mqtt_arbitrary_buffer example'''
+import paho.mqtt.client as mqtt
+import argparse
+import struct
+import array
+import sys
+
+return_str =[
+    "Connection successful",
+    "incorrect protocol version",
+    "invalid client identifier",
+    "server unavailable",
+    "bad username or password",
+    "not authorised"
+    ]
+
+args = None
+
+# The callback for when the client receives a CONNACK response from the server.
+def on_connect(client, userdata, rc):
+    """callback function on connect. Subscribes or exits depending on outcome"""
+    print("MQTT: "),
+    print(return_str[rc])
+    if(rc > 1):
+        print("Connection refused - " + return_str[rc])
+        sys.exit(rc)
+    # Subscribing in on_connect() means that if we lose the connection and
+    # reconnect then subscriptions will be renewed.
+    else:
+        print(return_str[rc])
+        client.subscribe(args.topic)
+        print("Subscribed to {}".format(args.topic))
+
+def on_disconnect(client, userdata, rc):
+    """Callback for disconnect"""
+    if rc != 0:
+        print("Unexpected disconnection.")
+        client.reconnect()
+
+# The callback for when a PUBLISH message is received from the server.
+def on_message(client, userdata, msg):
+    try:
+        pMsg = parseMsg(msg.payload)
+        print("Received char Array: \"{}\", val1: {}, val2: {}, val3: {}...".format(pMsg[0], pMsg[1], pMsg[2], pMsg[3]))
+
+    except Exception as err:
+        print err
+
+
+
+def argBegin():
+    parser = argparse.ArgumentParser(description='MQTT subscriber for Adafruit MQTT library mqtt_arbitrary_buffer example')
+    parser.add_argument("--host", default="localhost", help='mqtt host to connect to. Defaults to localhost.')
+    parser.add_argument("-p", "--port", default=1883, help='network port to connect to. Defaults to 1883.')
+    parser.add_argument("-t", "--topic", nargs='*', default="/feeds/arb_packet", help="mqtt topic to subscribe to. May be repeated multiple times.")
+    parser.add_argument("-u", "--username", default="testPy", help="provide a username (requires MQTT 3.1 broker)")
+    parser.add_argument("-P", "--password", default="testPy", help="provide a password (requires MQTT 3.1 broker)")
+    parser.add_argument("-k", "--keepalive", default=60, help="keep alive in seconds for this client. Defaults to 60.")
+
+    return parser.parse_args()
+
+
+def parseMsg(payload):
+    """Parses C struct from MQTT publisher Adafruit MQTT client to Python list"""
+
+    arr = array.array('B', payload) #convert python list to C-like array of unsigned char (B)
+
+    parsedStruct = struct.Struct('< 10s h L H') #define struct template (see below)
+    '''
+        Format of Struct from Adafruit MQTT client, Arduino, etc:
+
+        Adafruit MQTT client == Little endian (<)
+
+             Var NAME   | C TYPE (python symbol)    | size of member x bytes
+             -------------------------------------------------------------------
+              "charAry" |  uchar (s)               |   10s x 1 = 10 bytes
+              "val1"    |  int16 / short (h)       |   1h  x 2 =  2 bytes
+              "val2"    |  unsigned long (L)       |   1L  x 4 =  4 bytes
+              "val3"    |  uint16/unsigned short(H)|   1H  x 2 =  2 bytes
+              ------------------------------------------------------------------
+                                    Total packet size =         | 18 bytes |
+
+        See Section 7.3.2 of Python struct module documentation for complete format list
+        https://docs.python.org/2/library/struct.html
+    '''
+
+    charAry, val1, val2, val3 = parsedStruct.unpack_from(arr)  #convert byte array to formatted struct
+    charAry = charAry.rstrip(' \t\r\n\0') #remove trailing white space from buffer
+    return charAry, val1, val2, val3
+
+
+
+
+
+
+
+def main():
+    """Wait for incoming message published by Adafruit MQTT client"""
+    global args
+    args = argBegin()
+    client = mqtt.Client()
+    client.on_connect = on_connect
+    client.on_message = on_message
+    client.username_pw_set(args.username, args.password)
+    client.connect(args.host, args.port, args.keepalive)
+
+    # Blocking call that processes network traffic, dispatches callbacks and
+    # handles reconnecting.
+    # Other loop*() functions are available that give a threaded interface and a
+    # manual interface.
+    client.loop_forever()
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_cc3k/.leonardo.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_cc3k/.leonardo.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_cc3k/.uno.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_cc3k/.uno.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_cc3k/.zero.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_cc3k/.zero.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_esp8266/.zero.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_esp8266/.zero.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_esp8266/mqtt_esp8266.ino b/libraries/Adafruit_MQTT_Library/examples/mqtt_esp8266/mqtt_esp8266.ino
index 208e0ea..9df178d 100644
--- a/libraries/Adafruit_MQTT_Library/examples/mqtt_esp8266/mqtt_esp8266.ino
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_esp8266/mqtt_esp8266.ino
@@ -4,8 +4,9 @@
   Must use ESP8266 Arduino from:
     https://github.com/esp8266/Arduino
 
-  Works great with Adafruit's Huzzah ESP board:
+  Works great with Adafruit's Huzzah ESP board & Feather
   ----> https://www.adafruit.com/product/2471
+  ----> https://www.adafruit.com/products/2821
 
   Adafruit invests time and resources providing this open source code,
   please support Adafruit and open-source hardware by purchasing
@@ -26,7 +27,7 @@
 /************************* Adafruit.io Setup *********************************/
 
 #define AIO_SERVER      "io.adafruit.com"
-#define AIO_SERVERPORT  1883
+#define AIO_SERVERPORT  1883                   // use 8883 for SSL
 #define AIO_USERNAME    "...your AIO username (see https://accounts.adafruit.com)..."
 #define AIO_KEY         "...your AIO key..."
 
@@ -34,6 +35,8 @@
 
 // Create an ESP8266 WiFiClient class to connect to the MQTT server.
 WiFiClient client;
+// or... use WiFiFlientSecure for SSL
+//WiFiClientSecure client;
 
 // Store the MQTT server, username, and password in flash memory.
 // This is required for using the Adafruit MQTT library.
@@ -95,8 +98,10 @@ void loop() {
   MQTT_connect();
 
   // this is our 'wait for incoming subscription packets' busy subloop
+  // try to spend your time here
+
   Adafruit_MQTT_Subscribe *subscription;
-  while ((subscription = mqtt.readSubscription(1000))) {
+  while ((subscription = mqtt.readSubscription(5000))) {
     if (subscription == &onoffbutton) {
       Serial.print(F("Got: "));
       Serial.println((char *)onoffbutton.lastread);
@@ -114,12 +119,12 @@ void loop() {
   }
 
   // ping the server to keep the mqtt connection alive
+  // NOT required if you are publishing once every KEEPALIVE seconds
+  /*
   if(! mqtt.ping()) {
     mqtt.disconnect();
   }
-
-  delay(1000);
-
+  */
 }
 
 // Function to connect and reconnect as necessary to the MQTT server.
@@ -134,11 +139,17 @@ void MQTT_connect() {
 
   Serial.print("Connecting to MQTT... ");
 
+  uint8_t retries = 3;
   while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
        Serial.println(mqtt.connectErrorString(ret));
        Serial.println("Retrying MQTT connection in 5 seconds...");
        mqtt.disconnect();
        delay(5000);  // wait 5 seconds
+       retries--;
+       if (retries == 0) {
+         // basically die and wait for WDT to reset me
+         while (1);
+       }
   }
   Serial.println("MQTT Connected!");
-}
+}
\ No newline at end of file
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/fonahelper.cpp b/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/fonahelper.cpp
index d808604..822413e 100644
--- a/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/fonahelper.cpp
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/fonahelper.cpp
@@ -1,4 +1,5 @@
 #include <Adafruit_SleepyDog.h>
+#include <SoftwareSerial.h>
 #include "Adafruit_FONA.h"
 
 #define halt(s) { Serial.println(F( s )); while(1);  }
@@ -7,7 +8,6 @@ extern Adafruit_FONA fona;
 extern SoftwareSerial fonaSS;
 
 boolean FONAconnect(const __FlashStringHelper *apn, const __FlashStringHelper *username, const __FlashStringHelper *password) {
-  Watchdog.enable(8000);
   Watchdog.reset();
 
   Serial.println(F("Initializing FONA....(May take 3 seconds)"));
@@ -25,6 +25,9 @@ boolean FONAconnect(const __FlashStringHelper *apn, const __FlashStringHelper *u
   while (fona.getNetworkStatus() != 1) {
    delay(500);
   }
+
+  Watchdog.reset();
+  delay(5000);  // wait a few seconds to stabilize connection
   Watchdog.reset();
   
   fona.setGPRSNetworkSettings(apn, username, password);
@@ -33,6 +36,9 @@ boolean FONAconnect(const __FlashStringHelper *apn, const __FlashStringHelper *u
   fona.enableGPRS(false);
   
   Watchdog.reset();
+  delay(5000);  // wait a few seconds to stabilize connection
+  Watchdog.reset();
+
   Serial.println(F("Enabling GPRS"));
   if (!fona.enableGPRS(true)) {
     Serial.println(F("Failed to turn GPRS on"));  
@@ -42,4 +48,3 @@ boolean FONAconnect(const __FlashStringHelper *apn, const __FlashStringHelper *u
 
   return true;
 }
-
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/mqtt_fona.ino b/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/mqtt_fona.ino
index a7b00aa..ba8f389 100644
--- a/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/mqtt_fona.ino
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_fona/mqtt_fona.ino
@@ -88,22 +88,28 @@ uint8_t txfailures = 0;
 void setup() {
   while (!Serial);
 
+  // Watchdog is optional!
+  //Watchdog.enable(8000);
+  
   Serial.begin(115200);
 
   Serial.println(F("Adafruit FONA MQTT demo"));
 
-
   mqtt.subscribe(&onoffbutton);
 
+  Watchdog.reset();
+  delay(5000);  // wait a few seconds to stabilize connection
+  Watchdog.reset();
+  
   // Initialise the FONA module
   while (! FONAconnect(F(FONA_APN), F(FONA_USERNAME), F(FONA_PASSWORD))) {
-    halt("Retrying FONA");
+    Serial.println("Retrying FONA");
   }
 
   Serial.println(F("Connected to Cellular!"));
 
   Watchdog.reset();
-  delay(3000);  // wait a few seconds to stabilize connection
+  delay(5000);  // wait a few seconds to stabilize connection
   Watchdog.reset();
 }
 
@@ -118,6 +124,8 @@ void loop() {
   // function definition further below.
   MQTT_connect();
 
+  Watchdog.reset();
+  
   // this is our 'wait for incoming subscription packets' busy subloop
   Adafruit_MQTT_Subscribe *subscription;
   while ((subscription = mqtt.readSubscription(5000))) {
@@ -127,6 +135,7 @@ void loop() {
     }
   }
 
+  Watchdog.reset();
   // Now we can publish stuff!
   Serial.print(F("\nSending photocell val "));
   Serial.print(x);
@@ -139,10 +148,10 @@ void loop() {
     txfailures = 0;
   }
 
-  // ping the server to keep the mqtt connection alive
-  if(! mqtt.ping()) {
-    Serial.println(F("MQTT Ping failed."));
-  }
+  // ping the server to keep the mqtt connection alive, only needed if we're not publishing
+  //if(! mqtt.ping()) {
+  //  Serial.println(F("MQTT Ping failed."));
+  //}
 
 }
 
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_winc1500/mqtt_winc1500.ino b/libraries/Adafruit_MQTT_Library/examples/mqtt_winc1500/mqtt_winc1500.ino
new file mode 100644
index 0000000..082ffcd
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_winc1500/mqtt_winc1500.ino
@@ -0,0 +1,163 @@
+/***************************************************
+  Adafruit MQTT Library WINC1500 Example
+
+  Adafruit invests time and resources providing this open source code,
+  please support Adafruit and open-source hardware by purchasing
+  products from Adafruit!
+
+  Written by Limor Fried/Ladyada for Adafruit Industries.
+  MIT license, all text above must be included in any redistribution
+ ****************************************************/
+#include <SPI.h>
+#include "Adafruit_MQTT.h"
+#include "Adafruit_MQTT_Client.h"
+#include <Adafruit_WINC1500.h>
+
+
+/************************* WiFI Setup *****************************/
+#define WINC_CS   8
+#define WINC_IRQ  7
+#define WINC_RST  4
+
+Adafruit_WINC1500 WiFi(WINC_CS, WINC_IRQ, WINC_RST);
+
+char ssid[] = "yournetwork";     //  your network SSID (name)
+char pass[] = "yourpassword";    // your network password (use for WPA, or use as key for WEP)
+int keyIndex = 0;                // your network key Index number (needed only for WEP)
+
+int status = WL_IDLE_STATUS;
+
+/************************* Adafruit.io Setup *********************************/
+
+#define AIO_SERVER      "io.adafruit.com"
+#define AIO_SERVERPORT  1883
+#define AIO_USERNAME    "adafruit2"
+#define AIO_KEY         "3e148db54389a8b7c3efa9ddd2cd388317bcbf58"
+
+/************ Global State (you don't need to change this!) ******************/
+
+//Set up the wifi client
+Adafruit_WINC1500Client client;
+
+// Store the MQTT server, client ID, username, and password in flash memory.
+// This is required for using the Adafruit MQTT library.
+const char MQTT_SERVER[] PROGMEM    = AIO_SERVER;
+// Set a unique MQTT client ID using the AIO key + the date and time the sketch
+// was compiled (so this should be unique across multiple devices for a user,
+// alternatively you can manually set this to a GUID or other random value).
+const char MQTT_CLIENTID[] PROGMEM  = __TIME__ AIO_USERNAME;
+const char MQTT_USERNAME[] PROGMEM  = AIO_USERNAME;
+const char MQTT_PASSWORD[] PROGMEM  = AIO_KEY;
+
+Adafruit_MQTT_Client mqtt(&client, MQTT_SERVER, AIO_SERVERPORT, MQTT_CLIENTID, MQTT_USERNAME, MQTT_PASSWORD);
+
+// You don't need to change anything below this line!
+#define halt(s) { Serial.println(F( s )); while(1);  }
+
+/****************************** Feeds ***************************************/
+
+// Setup a feed called 'photocell' for publishing.
+// Notice MQTT paths for AIO follow the form: <username>/feeds/<feedname>
+const char PHOTOCELL_FEED[] PROGMEM = AIO_USERNAME "/feeds/photocell";
+Adafruit_MQTT_Publish photocell = Adafruit_MQTT_Publish(&mqtt, PHOTOCELL_FEED);
+
+// Setup a feed called 'onoff' for subscribing to changes.
+const char ONOFF_FEED[] PROGMEM = AIO_USERNAME "/feeds/onoff";
+Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, ONOFF_FEED);
+
+/*************************** Sketch Code ************************************/
+
+#define LEDPIN 13
+
+void setup() {
+
+  while (!Serial);
+  Serial.begin(115200);
+
+  Serial.println(F("Adafruit MQTT demo for WINC1500"));
+
+  // Initialise the Client
+  Serial.print(F("\nInit the WiFi module..."));
+  // check for the presence of the breakout
+  if (WiFi.status() == WL_NO_SHIELD) {
+    Serial.println("WINC1500 not present");
+    // don't continue:
+    while (true);
+  }
+  Serial.println("ATWINC OK!");
+  
+  pinMode(LEDPIN, OUTPUT);
+  mqtt.subscribe(&onoffbutton);
+}
+
+uint32_t x=0;
+
+void loop() {
+  // Ensure the connection to the MQTT server is alive (this will make the first
+  // connection and automatically reconnect when disconnected).  See the MQTT_connect
+  // function definition further below.
+  MQTT_connect();
+
+  // this is our 'wait for incoming subscription packets' busy subloop
+  Adafruit_MQTT_Subscribe *subscription;
+  while ((subscription = mqtt.readSubscription(5000))) {
+    if (subscription == &onoffbutton) {
+      Serial.print(F("Got: "));
+      Serial.println((char *)onoffbutton.lastread);
+
+      if (0 == strcmp((char *)onoffbutton.lastread, "OFF")) {
+        digitalWrite(LEDPIN, LOW);
+      }
+      if (0 == strcmp((char *)onoffbutton.lastread, "ON")) {
+        digitalWrite(LEDPIN, HIGH);
+      }
+    }
+  }
+
+  // Now we can publish stuff!
+  Serial.print(F("\nSending photocell val "));
+  Serial.print(x);
+  Serial.print("...");
+  if (! photocell.publish(x++)) {
+    Serial.println(F("Failed"));
+  } else {
+    Serial.println(F("OK!"));
+  }
+
+}
+
+// Function to connect and reconnect as necessary to the MQTT server.
+// Should be called in the loop function and it will take care if connecting.
+void MQTT_connect() {
+  int8_t ret;
+
+  // attempt to connect to Wifi network:
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print("Attempting to connect to SSID: ");
+    Serial.println(ssid);
+    // Connect to WPA/WPA2 network. Change this line if using open or WEP network:
+    status = WiFi.begin(ssid, pass);
+
+    // wait 10 seconds for connection:
+    uint8_t timeout = 10;
+    while (timeout && (WiFi.status() != WL_CONNECTED)) {
+      timeout--;
+      delay(1000);
+    }
+  }
+  
+  // Stop if already connected.
+  if (mqtt.connected()) {
+    return;
+  }
+
+  Serial.print("Connecting to MQTT... ");
+
+  while ((ret = mqtt.connect()) != 0) { // connect will return 0 for connected
+       Serial.println(mqtt.connectErrorString(ret));
+       Serial.println("Retrying MQTT connection in 5 seconds...");
+       mqtt.disconnect();
+       delay(5000);  // wait 5 seconds
+  }
+  Serial.println("MQTT Connected!");
+}
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/.leonardo.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/.leonardo.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/.uno.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/.uno.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/.zero.test.skip b/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/.zero.test.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/mqtt_yun.ino b/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/mqtt_yun.ino
index b02d06d..b4d39b9 100644
--- a/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/mqtt_yun.ino
+++ b/libraries/Adafruit_MQTT_Library/examples/mqtt_yun/mqtt_yun.ino
@@ -95,7 +95,7 @@ void loop() {
 
   // ping the server to keep the mqtt connection alive
   if(! mqtt.ping()) {
-    Serial.println(F("MQTT Ping failed."));
+    Console.println(F("MQTT Ping failed."));
   }
 
   delay(1000);
diff --git a/libraries/Adafruit_MQTT_Library/keywords.txt b/libraries/Adafruit_MQTT_Library/keywords.txt
new file mode 100644
index 0000000..afd6959
--- /dev/null
+++ b/libraries/Adafruit_MQTT_Library/keywords.txt
@@ -0,0 +1,21 @@
+Adafruit_MQTT	KEYWORD1
+Adafruit_MQTT_CC3000	KEYWORD1
+Adafruit_MQTT_FONA	KEYWORD1
+Adafruit_MQTT_Client	KEYWORD1
+Adafruit_MQTT_Publish	KEYWORD1
+Adafruit_MQTT_Subscribe KEYWORD1
+connect	KEYWORD2
+connectErrorString	KEYWORD2
+disconnect	KEYWORD2
+connected	KEYWORD2
+will	KEYWORD2
+publish	KEYWORD2
+subscribe	KEYWORD2
+unsubscribe	KEYWORD2
+readSubscription	KEYWORD2
+ping	KEYWORD2
+setCallback	KEYWORD2
+connectServer	KEYWORD2
+disconnectServer	KEYWORD2
+readPacket	KEYWORD2
+sendPacket	KEYWORD2
diff --git a/libraries/Adafruit_MQTT_Library/library.properties b/libraries/Adafruit_MQTT_Library/library.properties
index b70a127..e5e5487 100644
--- a/libraries/Adafruit_MQTT_Library/library.properties
+++ b/libraries/Adafruit_MQTT_Library/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit MQTT Library
-version=0.12.1
+version=0.13.3
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=MQTT library that supports the CC3000, FONA, ESP8266, Yun, and generic Arduino Client hardware.
diff --git a/libraries/ESP8266Ping/LICENSE b/libraries/ESP8266Ping/LICENSE
new file mode 100644
index 0000000..4f1fb49
--- /dev/null
+++ b/libraries/ESP8266Ping/LICENSE
@@ -0,0 +1,456 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
\ No newline at end of file
diff --git a/libraries/ESP8266Ping/README.md b/libraries/ESP8266Ping/README.md
new file mode 100644
index 0000000..6f89237
--- /dev/null
+++ b/libraries/ESP8266Ping/README.md
@@ -0,0 +1,40 @@
+# ESP8266Ping
+Let the ESP8266 ping a remote machine.
+
+With this library an ESP8266 can ping a remote machine and know if it's reachable.
+It provide some basic measurements on ping messages (avg response time).
+
+## Usage
+
+First, include the library in your sketch along with WiFi library:
+
+```Arduino
+#include <ESP8266WiFi.h>
+#include <ESP8266Ping.h>
+```
+
+Next, simply call the `Ping.ping()` function
+
+```Arduino
+IPAddress ip (192, 168, 0, 1); // The remote ip to ping
+bool ret = Ping.ping(ip);
+```
+
+`ret` will be true if the remote responded to pings, false if not reachable.
+The library supports hostname too, just pass a string instead of the ip address:
+
+```Arduino
+bool ret = Ping.ping("www.google.com");
+```
+
+Additionally, the function accept a second integer parameter `count` that specify how many pings has to be sent:
+
+```Arduino
+bool ret = Ping.ping(ip_or_host, 10);
+```
+
+After `Ping.ping()` has been called, the average response time (in milliseconds) can be retrieved with
+
+```Arduino
+int avg_time_ms = Ping.averageTime();
+```
diff --git a/libraries/ESP8266Ping/examples/HostPing/HostPing.ino b/libraries/ESP8266Ping/examples/HostPing/HostPing.ino
new file mode 100644
index 0000000..1980d25
--- /dev/null
+++ b/libraries/ESP8266Ping/examples/HostPing/HostPing.ino
@@ -0,0 +1,43 @@
+/*
+ * This example show how to ping a remote machine using it's hostname
+ */
+
+#include <ESP8266WiFi.h>
+#include <ESP8266Ping.h>
+
+const char* ssid     = "ssid";
+const char* password = "passphrase";
+
+const char* remote_host = "www.google.com";
+
+void setup() {
+  Serial.begin(115200);
+  delay(10);
+
+  // We start by connecting to a WiFi network
+
+  Serial.println();
+  Serial.println("Connecting to WiFi");
+  
+  WiFi.begin(ssid, password);
+  
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(100);
+    Serial.print(".");
+  }
+
+  Serial.println();
+  Serial.print("WiFi connected with ip ");  
+  Serial.println(WiFi.localIP());
+
+  Serial.print("Pinging host ");
+  Serial.println(remote_host);
+
+  if(Ping.ping(remote_host)) {
+    Serial.println("Success!!");
+  } else {
+    Serial.println("Error :(");
+  }
+}
+
+void loop() { }
diff --git a/libraries/ESP8266Ping/examples/SimplePing/SimplePing.ino b/libraries/ESP8266Ping/examples/SimplePing/SimplePing.ino
new file mode 100644
index 0000000..3328596
--- /dev/null
+++ b/libraries/ESP8266Ping/examples/SimplePing/SimplePing.ino
@@ -0,0 +1,44 @@
+/*
+ * With this library an ESP8266 can ping a remote machine and know if it's reachable. 
+ * It provides some basic measurements on ping messages (avg response time).
+ */
+
+#include <ESP8266WiFi.h>
+#include <ESP8266Ping.h>
+
+const char* ssid     = "ssid";
+const char* password = "passphrase";
+
+const IPAddress remote_ip(192, 168, 0, 1);
+
+void setup() {
+  Serial.begin(115200);
+  delay(10);
+
+  // We start by connecting to a WiFi network
+
+  Serial.println();
+  Serial.println("Connecting to WiFi");
+  
+  WiFi.begin(ssid, password);
+  
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(100);
+    Serial.print(".");
+  }
+
+  Serial.println();
+  Serial.print("WiFi connected with ip ");  
+  Serial.println(WiFi.localIP());
+
+  Serial.print("Pinging ip ");
+  Serial.println(remote_ip);
+
+  if(Ping.ping(remote_ip)) {
+    Serial.println("Success!!");
+  } else {
+    Serial.println("Error :(");
+  }
+}
+
+void loop() { }
diff --git a/libraries/ESP8266Ping/keywords.txt b/libraries/ESP8266Ping/keywords.txt
new file mode 100644
index 0000000..9bee793
--- /dev/null
+++ b/libraries/ESP8266Ping/keywords.txt
@@ -0,0 +1,26 @@
+#######################################
+# Syntax Coloring Map For ESP8266Ping
+#######################################
+
+#######################################
+# Library (KEYWORD3)
+#######################################
+
+ESP8266Ping	KEYWORD3
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+Ping	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+ping	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+
diff --git a/libraries/ESP8266Ping/library.properties b/libraries/ESP8266Ping/library.properties
new file mode 100644
index 0000000..5fd3ebd
--- /dev/null
+++ b/libraries/ESP8266Ping/library.properties
@@ -0,0 +1,9 @@
+name=ESP8266Ping
+version=1.0
+author=Daniele Colanardi
+maintainer=Daniele Colanardi <dancol90@gmail.com>
+sentence=Let the ESP8266 ping a remote machine.
+paragraph=With this library an ESP8266 can ping a remote machine and know if it's reachable. It provide some basic measurements on ping messages (avg response time).
+category=Communication
+url=
+architectures=esp8266
diff --git a/libraries/ESP8266Ping/src/ESP8266Ping.h b/libraries/ESP8266Ping/src/ESP8266Ping.h
new file mode 100644
index 0000000..bd53d8d
--- /dev/null
+++ b/libraries/ESP8266Ping/src/ESP8266Ping.h
@@ -0,0 +1,59 @@
+/*
+  ESP8266Ping - Ping library for ESP8266
+  Copyright (c) 2015 Daniele Colanardi. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ESP8266Ping_H
+#define ESP8266Ping_H
+
+#include <Arduino.h>
+#include <ESP8266WiFi.h>
+
+extern "C" {
+  #include <ping.h>
+}
+
+#ifdef ENABLE_DEBUG_PING
+  #define DEBUG_PING(...) Serial.printf(__VA_ARGS__)
+#else
+  #define DEBUG_PING(...)
+#endif
+
+class PingClass {
+  public:
+    PingClass();
+
+    bool ping(IPAddress dest,   byte count = 5);
+    bool ping(const char* host, byte count = 5);
+
+    int averageTime();
+
+  protected:
+    static void _ping_sent_cb(void *opt, void *pdata);
+    static void _ping_recv_cb(void *opt, void *pdata);
+
+    IPAddress _dest;
+    ping_option _options;
+
+    static byte _expected_count, _errors, _success;
+    static int _avg_time;
+};
+
+#include "ESP8266Ping.impl.h"
+PingClass Ping;
+
+#endif
diff --git a/libraries/ESP8266Ping/src/ESP8266Ping.impl.h b/libraries/ESP8266Ping/src/ESP8266Ping.impl.h
new file mode 100644
index 0000000..5dee25a
--- /dev/null
+++ b/libraries/ESP8266Ping/src/ESP8266Ping.impl.h
@@ -0,0 +1,111 @@
+/*
+  ESP8266Ping - Ping library for ESP8266
+  Copyright (c) 2015 Daniele Colanardi. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+extern "C" void esp_schedule();
+extern "C" void esp_yield();
+
+PingClass::PingClass() {}
+
+bool PingClass::ping(IPAddress dest, byte count) {
+    _expected_count = count;
+    _errors = 0;
+    _success = 0;
+
+    _avg_time = 0;
+
+    memset(&_options, 0, sizeof(struct ping_option));
+    
+    // Repeat count (how many time send a ping message to destination)
+    _options.count = count;
+    // Time interval between two ping (seconds??)
+    _options.coarse_time = 1;
+    // Destination machine
+    _options.ip = dest;
+    
+    // Callbacks
+    _options.recv_function = reinterpret_cast<ping_recv_function>(&PingClass::_ping_recv_cb);
+    _options.sent_function = NULL; //reinterpret_cast<ping_sent_function>(&_ping_sent_cb);
+
+    // Let's go!
+    if(ping_start(&_options)) {
+        // Suspend till the process end
+        esp_yield();
+    }
+
+    return (_success > 0);
+}
+
+bool PingClass::ping(const char* host, byte count) {
+    IPAddress remote_addr;
+
+    if (WiFi.hostByName(host, remote_addr))
+        return ping(remote_addr, count);
+
+    return false;
+}
+
+int PingClass::averageTime() {
+    return _avg_time;
+}
+
+void PingClass::_ping_recv_cb(void *opt, void *resp) {
+    // Cast the parameters to get some usable info
+    ping_resp*   ping_resp = reinterpret_cast<struct ping_resp*>(resp);
+    ping_option* ping_opt  = reinterpret_cast<struct ping_option*>(opt);
+    
+    // Error or success?
+    if (ping_resp->ping_err == -1)
+        _errors++;
+    else {
+        _success++;
+        _avg_time += ping_resp->resp_time;
+    }
+
+    // Some debug info
+    DEBUG_PING(
+            "DEBUG: ping reply\n"
+            "\ttotal_count = %d \n"
+            "\tresp_time = %d \n"
+            "\tseqno = %d \n"
+            "\ttimeout_count = %d \n"
+            "\tbytes = %d \n"
+            "\ttotal_bytes = %d \n"
+            "\ttotal_time = %d \n"
+            "\tping_err = %d \n",
+            ping_resp->total_count, ping_resp->resp_time, ping_resp->seqno,
+            ping_resp->timeout_count, ping_resp->bytes, ping_resp->total_bytes,
+            ping_resp->total_time, ping_resp->ping_err
+    );
+
+    // Is it time to end?
+    // Don't using seqno because it does not increase on error
+    if (_success + _errors == _expected_count) {
+        _avg_time = _avg_time / _expected_count;
+
+        DEBUG_PING("Avg resp time %d ms\n", _avg_time);
+
+        // Done, return to main functiom
+        esp_schedule();
+    }
+}
+
+byte PingClass::_expected_count = 0;
+byte PingClass::_errors = 0;
+byte PingClass::_success = 0;
+int  PingClass::_avg_time = 0;
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplay.cpp b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplay.cpp
new file mode 100644
index 0000000..7dcc3ce
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplay.cpp
@@ -0,0 +1,753 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#include "OLEDDisplay.h"
+
+bool OLEDDisplay::init() {
+  this->buffer = (uint8_t*) malloc(sizeof(uint8_t) * DISPLAY_BUFFER_SIZE);
+  if(!this->buffer) {
+    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create display\n");
+    return false;
+  }
+
+  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+  this->buffer_back = (uint8_t*) malloc(sizeof(uint8_t) * DISPLAY_BUFFER_SIZE);
+  if(!this->buffer_back) {
+    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][init] Not enough memory to create back buffer\n");
+    free(this->buffer);
+    return false;
+  }
+  #endif
+
+  sendInitCommands();
+  resetDisplay();
+
+  return true;
+}
+
+void OLEDDisplay::end() {
+  if (this->buffer) free(this->buffer);
+  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+  if (this->buffer_back) free(this->buffer_back);
+  #endif
+}
+
+void OLEDDisplay::resetDisplay(void) {
+  clear();
+  #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+  memset(buffer_back, 1, DISPLAY_BUFFER_SIZE);
+  #endif
+  display();
+}
+
+void OLEDDisplay::setColor(OLEDDISPLAY_COLOR color) {
+  this->color = color;
+}
+
+void OLEDDisplay::setPixel(int16_t x, int16_t y) {
+  if (x >= 0 && x < 128 && y >= 0 && y < 64) {
+    switch (color) {
+      case WHITE:   buffer[x + (y / 8) * DISPLAY_WIDTH] |=  (1 << (y & 7)); break;
+      case BLACK:   buffer[x + (y / 8) * DISPLAY_WIDTH] &= ~(1 << (y & 7)); break;
+      case INVERSE: buffer[x + (y / 8) * DISPLAY_WIDTH] ^=  (1 << (y & 7)); break;
+    }
+  }
+}
+
+// Bresenham's algorithm - thx wikipedia and Adafruit_GFX
+void OLEDDisplay::drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1) {
+  int16_t steep = abs(y1 - y0) > abs(x1 - x0);
+  if (steep) {
+    _swap_int16_t(x0, y0);
+    _swap_int16_t(x1, y1);
+  }
+
+  if (x0 > x1) {
+    _swap_int16_t(x0, x1);
+    _swap_int16_t(y0, y1);
+  }
+
+  int16_t dx, dy;
+  dx = x1 - x0;
+  dy = abs(y1 - y0);
+
+  int16_t err = dx / 2;
+  int16_t ystep;
+
+  if (y0 < y1) {
+    ystep = 1;
+  } else {
+    ystep = -1;
+  }
+
+  for (; x0<=x1; x0++) {
+    if (steep) {
+      setPixel(y0, x0);
+    } else {
+      setPixel(x0, y0);
+    }
+    err -= dy;
+    if (err < 0) {
+      y0 += ystep;
+      err += dx;
+    }
+  }
+}
+
+void OLEDDisplay::drawRect(int16_t x, int16_t y, int16_t width, int16_t height) {
+  drawHorizontalLine(x, y, width);
+  drawVerticalLine(x, y, height);
+  drawVerticalLine(x + width, y, height);
+  drawHorizontalLine(x, y + height, width);
+}
+
+void OLEDDisplay::fillRect(int16_t xMove, int16_t yMove, int16_t width, int16_t height) {
+  for (int16_t i = yMove; i < yMove + height; i++) {
+    drawHorizontalLine(xMove, i, width);
+  }
+}
+
+void OLEDDisplay::drawCircle(int16_t x0, int16_t y0, int16_t radius) {
+  int16_t x = 0, y = radius;
+	int16_t dp = 1 - radius;
+	do {
+		if (dp < 0)
+			dp = dp + 2 * (++x) + 3;
+		else
+			dp = dp + 2 * (++x) - 2 * (--y) + 5;
+
+		setPixel(x0 + x, y0 + y);     //For the 8 octants
+		setPixel(x0 - x, y0 + y);
+		setPixel(x0 + x, y0 - y);
+		setPixel(x0 - x, y0 - y);
+		setPixel(x0 + y, y0 + x);
+		setPixel(x0 - y, y0 + x);
+		setPixel(x0 + y, y0 - x);
+		setPixel(x0 - y, y0 - x);
+
+	} while (x < y);
+
+  setPixel(x0 + radius, y0);
+  setPixel(x0, y0 + radius);
+  setPixel(x0 - radius, y0);
+  setPixel(x0, y0 - radius);
+}
+
+void OLEDDisplay::fillCircle(int16_t x0, int16_t y0, int16_t radius) {
+  int16_t x = 0, y = radius;
+	int16_t dp = 1 - radius;
+	do {
+		if (dp < 0)
+			dp = dp + 2 * (++x) + 3;
+		else
+			dp = dp + 2 * (++x) - 2 * (--y) + 5;
+
+    drawHorizontalLine(x0 - x, y0 - y, 2*x);
+    drawHorizontalLine(x0 - x, y0 + y, 2*x);
+    drawHorizontalLine(x0 - y, y0 - x, 2*y);
+    drawHorizontalLine(x0 - y, y0 + x, 2*y);
+
+
+	} while (x < y);
+  drawHorizontalLine(x0 - radius, y0, 2 * radius);
+
+}
+
+void OLEDDisplay::drawHorizontalLine(int16_t x, int16_t y, int16_t length) {
+  if (y < 0 || y >= DISPLAY_HEIGHT) { return; }
+
+  if (x < 0) {
+    length += x;
+    x = 0;
+  }
+
+  if ( (x + length) > DISPLAY_WIDTH) {
+    length = (DISPLAY_WIDTH - x);
+  }
+
+  if (length <= 0) { return; }
+
+  uint8_t * bufferPtr = buffer;
+  bufferPtr += (y >> 3) * DISPLAY_WIDTH;
+  bufferPtr += x;
+
+  uint8_t drawBit = 1 << (y & 7);
+
+  switch (color) {
+    case WHITE:   while (length--) {
+        *bufferPtr++ |= drawBit;
+      }; break;
+    case BLACK:   drawBit = ~drawBit;   while (length--) {
+        *bufferPtr++ &= drawBit;
+      }; break;
+    case INVERSE: while (length--) {
+        *bufferPtr++ ^= drawBit;
+      }; break;
+  }
+}
+
+void OLEDDisplay::drawVerticalLine(int16_t x, int16_t y, int16_t length) {
+  if (y < 0 || y > DISPLAY_HEIGHT) return;
+
+  if (x < 0) {
+    length += x;
+    x = 0;
+  }
+
+  if (length < 0) return;
+
+
+  uint8_t yOffset = y & 7;
+  uint8_t drawBit;
+  uint8_t *bufferPtr = buffer;
+
+  bufferPtr += (y >> 3) * DISPLAY_WIDTH;
+  bufferPtr += x;
+
+  if (yOffset) {
+    yOffset = 8 - yOffset;
+    drawBit = ~(0xFF >> (yOffset));
+
+    if (length < yOffset) {
+      drawBit &= (0xFF >> (yOffset - length));
+    }
+
+    switch (color) {
+      case WHITE:   *bufferPtr |= drawBit; break;
+      case BLACK:   *bufferPtr &= drawBit; break;
+      case INVERSE: *bufferPtr ^= drawBit; break;
+    }
+
+    if (length < yOffset) return;
+
+    length -= yOffset;
+    bufferPtr += DISPLAY_WIDTH;
+  }
+
+  if (length >= 8) {
+    switch (color) {
+      case WHITE:
+      case BLACK:
+        drawBit = (color == WHITE) ? 0xFF : 0x00;
+        do {
+          *bufferPtr = drawBit;
+          bufferPtr += DISPLAY_WIDTH;
+          length -= 8;
+        } while (length >= 8);
+        break;
+      case INVERSE:
+        do {
+          *bufferPtr = ~(*bufferPtr);
+          bufferPtr += DISPLAY_WIDTH;
+          length -= 8;
+        } while (length >= 8);
+        break;
+    }
+  }
+
+  if (length > 0) {
+    drawBit = (1 << length & 7) - 1;
+    switch (color) {
+      case WHITE:   *bufferPtr |= drawBit; break;
+      case BLACK:   *bufferPtr &= drawBit; break;
+      case INVERSE: *bufferPtr ^= drawBit; break;
+    }
+  }
+}
+
+void OLEDDisplay::drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress) {
+  uint16_t radius = height / 2;
+  uint16_t innerRadius = radius - 3;
+  setColor(WHITE);
+  drawCircle(x + radius, y + radius, radius);
+  drawRect(x+radius, y, width - 2*radius, height);
+  drawCircle(x + width - radius, y + radius, radius);
+  setColor(BLACK);
+  fillRect(x+radius, y+1, width - 2*radius + 1, height - 1);
+  setColor(WHITE);
+  uint16_t maxProgressWidth = (width - 2 * radius) * progress / 100;
+  for (uint16_t i = 0; i < maxProgressWidth; i++) {
+    fillCircle(x + radius + i, y + radius, innerRadius);
+  }
+
+}
+
+void OLEDDisplay::drawFastImage(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *image) {
+  drawInternal(xMove, yMove, width, height, image, 0, 0);
+}
+
+void OLEDDisplay::drawXbm(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *xbm) {
+  int16_t widthInXbm = (width + 7) / 8;
+  uint8_t data;
+
+  for(int16_t y = 0; y < height; y++) {
+    for(int16_t x = 0; x < width; x++ ) {
+      if (x & 7) {
+        data >>= 1; // Move a bit
+      } else {  // Read new data every 8 bit
+        data = pgm_read_byte(xbm + (x / 8) + y * widthInXbm);
+      }
+      // if there is a bit draw it
+      if (data & 0x01) {
+        setPixel(xMove + x, yMove + y);
+      }
+    }
+  }
+}
+
+void OLEDDisplay::drawStringInternal(int16_t xMove, int16_t yMove, char* text, uint16_t textLength, uint16_t textWidth) {
+  uint8_t textHeight       = pgm_read_byte(fontData + HEIGHT_POS);
+  uint8_t firstChar        = pgm_read_byte(fontData + FIRST_CHAR_POS);
+  uint16_t sizeOfJumpTable = pgm_read_byte(fontData + CHAR_NUM_POS)  * JUMPTABLE_BYTES;
+
+  uint8_t cursorX         = 0;
+  uint8_t cursorY         = 0;
+
+  switch (textAlignment) {
+    case TEXT_ALIGN_CENTER_BOTH:
+      yMove -= textHeight >> 1;
+    // Fallthrough
+    case TEXT_ALIGN_CENTER:
+      xMove -= textWidth >> 1; // divide by 2
+      break;
+    case TEXT_ALIGN_RIGHT:
+      xMove -= textWidth;
+      break;
+  }
+
+  // Don't draw anything if it is not on the screen.
+  if (xMove + textWidth  < 0 || xMove > DISPLAY_WIDTH ) {return;}
+  if (yMove + textHeight < 0 || yMove > DISPLAY_HEIGHT) {return;}
+
+  for (uint16_t j = 0; j < textLength; j++) {
+    int16_t xPos = xMove + cursorX;
+    int16_t yPos = yMove + cursorY;
+
+    byte code = text[j];
+    if (code >= firstChar) {
+      byte charCode = code - firstChar;
+
+      // 4 Bytes per char code
+      byte msbJumpToChar    = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES );                  // MSB  \ JumpAddress
+      byte lsbJumpToChar    = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_LSB);   // LSB /
+      byte charByteSize     = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_SIZE);  // Size
+      byte currentCharWidth = pgm_read_byte( fontData + JUMPTABLE_START + charCode * JUMPTABLE_BYTES + JUMPTABLE_WIDTH); // Width
+
+      // Test if the char is drawable
+      if (!(msbJumpToChar == 255 && lsbJumpToChar == 255)) {
+        // Get the position of the char data
+        uint16_t charDataPosition = JUMPTABLE_START + sizeOfJumpTable + ((msbJumpToChar << 8) + lsbJumpToChar);
+        drawInternal(xPos, yPos, currentCharWidth, textHeight, fontData, charDataPosition, charByteSize);
+      }
+
+      cursorX += currentCharWidth;
+    }
+  }
+}
+
+
+void OLEDDisplay::drawString(int16_t xMove, int16_t yMove, String strUser) {
+  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
+
+  // char* text must be freed!
+  char* text = utf8ascii(strUser);
+
+  uint16_t xOffset = 0;
+  // If the string should be centered vertically too
+  // we need to now how heigh the string is.
+  if (textAlignment == TEXT_ALIGN_CENTER_BOTH) {
+    uint16_t lb;
+    // Find number of linebreaks in text
+    for (uint16_t i=0, lb=0; text[i]; i++) {
+      lb += (text[i] == '\n');
+    }
+    // Calculate center
+    xOffset = (lb * lineHeight) / 2;
+  }
+
+  uint16_t line = 0;
+  char* textPart = strtok(text,"\n");
+  while (textPart != NULL) {
+    uint16_t length = strlen(textPart);
+    drawStringInternal(xMove - xOffset, yMove + (line++) * lineHeight, textPart, length, getStringWidth(textPart, length));
+    textPart = strtok(NULL, "\n");
+  }
+  free(text);
+}
+
+void OLEDDisplay::drawStringMaxWidth(int16_t xMove, int16_t yMove, uint16_t maxLineWidth, String strUser) {
+  uint16_t firstChar  = pgm_read_byte(fontData + FIRST_CHAR_POS);
+  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
+
+  char* text = utf8ascii(strUser);
+
+  uint16_t length = strlen(text);
+  uint16_t lastDrawnPos = 0;
+  uint16_t lineNumber = 0;
+  uint16_t strWidth = 0;
+
+  uint16_t preferredBreakpoint = 0;
+  uint16_t widthAtBreakpoint = 0;
+
+  for (uint16_t i = 0; i < length; i++) {
+    strWidth += pgm_read_byte(fontData + JUMPTABLE_START + (text[i] - firstChar) * JUMPTABLE_BYTES + JUMPTABLE_WIDTH);
+
+    // Always try to break on a space or dash
+    if (text[i] == ' ' || text[i]== '-') {
+      preferredBreakpoint = i;
+      widthAtBreakpoint = strWidth;
+    }
+
+    if (strWidth >= maxLineWidth) {
+      preferredBreakpoint = preferredBreakpoint ? preferredBreakpoint : i;
+      widthAtBreakpoint = preferredBreakpoint ? widthAtBreakpoint : strWidth;
+
+      drawStringInternal(xMove, yMove + (lineNumber++) * lineHeight , &text[lastDrawnPos], preferredBreakpoint - lastDrawnPos, widthAtBreakpoint);
+      lastDrawnPos = preferredBreakpoint + 1; strWidth = 0; preferredBreakpoint = 0;
+    }
+  }
+
+  // Draw last part if needed
+  if (lastDrawnPos < length) {
+    drawStringInternal(xMove, yMove + lineNumber * lineHeight , &text[lastDrawnPos], length - lastDrawnPos, getStringWidth(&text[lastDrawnPos], length - lastDrawnPos));
+  }
+
+  free(text);
+}
+
+uint16_t OLEDDisplay::getStringWidth(const char* text, uint16_t length) {
+  uint16_t firstChar        = pgm_read_byte(fontData + FIRST_CHAR_POS);
+
+  uint16_t stringWidth = 0;
+  uint16_t maxWidth = 0;
+
+  while (length--) {
+    stringWidth += pgm_read_byte(fontData + JUMPTABLE_START + (text[length] - firstChar) * JUMPTABLE_BYTES + JUMPTABLE_WIDTH);
+    if (text[length] == 10) {
+      maxWidth = max(maxWidth, stringWidth);
+      stringWidth = 0;
+    }
+  }
+
+  return max(maxWidth, stringWidth);
+}
+
+uint16_t OLEDDisplay::getStringWidth(String strUser) {
+  char* text = utf8ascii(strUser);
+  uint16_t length = strlen(text);
+  uint16_t width = getStringWidth(text, length);
+  free(text);
+  return width;
+}
+
+void OLEDDisplay::setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment) {
+  this->textAlignment = textAlignment;
+}
+
+void OLEDDisplay::setFont(const char *fontData) {
+  this->fontData = fontData;
+}
+
+void OLEDDisplay::displayOn(void) {
+  sendCommand(DISPLAYON);
+}
+
+void OLEDDisplay::displayOff(void) {
+  sendCommand(DISPLAYOFF);
+}
+
+void OLEDDisplay::invertDisplay(void) {
+  sendCommand(INVERTDISPLAY);
+}
+
+void OLEDDisplay::normalDisplay(void) {
+  sendCommand(NORMALDISPLAY);
+}
+
+void OLEDDisplay::setContrast(char contrast) {
+  sendCommand(SETCONTRAST);
+  sendCommand(contrast);
+}
+
+void OLEDDisplay::flipScreenVertically() {
+  sendCommand(SEGREMAP | 0x01);
+  sendCommand(COMSCANDEC);           //Rotate screen 180 Deg
+}
+
+void OLEDDisplay::clear(void) {
+  memset(buffer, 0, DISPLAY_BUFFER_SIZE);
+}
+
+void OLEDDisplay::drawLogBuffer(uint16_t xMove, uint16_t yMove) {
+  uint16_t lineHeight = pgm_read_byte(fontData + HEIGHT_POS);
+  // Always align left
+  setTextAlignment(TEXT_ALIGN_LEFT);
+
+  // State values
+  uint16_t length   = 0;
+  uint16_t line     = 0;
+  uint16_t lastPos  = 0;
+
+  for (uint16_t i=0;i<this->logBufferFilled;i++){
+    // Everytime we have a \n print
+    if (this->logBuffer[i] == 10) {
+      length++;
+      // Draw string on line `line` from lastPos to length
+      // Passing 0 as the lenght because we are in TEXT_ALIGN_LEFT
+      drawStringInternal(xMove, yMove + (line++) * lineHeight, &this->logBuffer[lastPos], length, 0);
+      // Remember last pos
+      lastPos = i;
+      // Reset length
+      length = 0;
+    } else {
+      // Count chars until next linebreak
+      length++;
+    }
+  }
+  // Draw the remaining string
+  if (length > 0) {
+    drawStringInternal(xMove, yMove + line * lineHeight, &this->logBuffer[lastPos], length, 0);
+  }
+}
+
+bool OLEDDisplay::setLogBuffer(uint16_t lines, uint16_t chars){
+  if (logBuffer != NULL) free(logBuffer);
+  uint16_t size = lines * chars;
+  if (size > 0) {
+    this->logBufferLine     = 0;      // Lines printed
+    this->logBufferMaxLines = lines;  // Lines max printable
+    this->logBufferSize     = size;   // Total number of characters the buffer can hold
+    this->logBuffer         = (char *) malloc(size * sizeof(uint8_t));
+    if(!this->logBuffer) {
+      DEBUG_OLEDDISPLAY("[OLEDDISPLAY][setLogBuffer] Not enough memory to create log buffer\n");
+      return false;
+    }
+  }
+  return true;
+}
+
+size_t OLEDDisplay::write(uint8_t c) {
+  if (this->logBufferSize > 0) {
+    // Don't waste space on \r\n line endings, dropping \r
+    if (c == 13) return 1;
+
+    bool maxLineNotReached = this->logBufferLine < this->logBufferMaxLines;
+    bool bufferNotFull = this->logBufferFilled < this->logBufferSize;
+
+    // Can we write to the buffer?
+    if (bufferNotFull && maxLineNotReached) {
+      this->logBuffer[logBufferFilled] = utf8ascii(c);
+      this->logBufferFilled++;
+      // Keep track of lines written
+      if (c == 10) this->logBufferLine++;
+    } else {
+      // Max line number is reached
+      if (!maxLineNotReached) this->logBufferLine--;
+
+      // Find the end of the first line
+      uint16_t firstLineEnd = 0;
+      for (uint16_t i=0;i<this->logBufferFilled;i++) {
+        if (this->logBuffer[i] == 10){
+          // Include last char too
+          firstLineEnd = i + 1;
+          break;
+        }
+      }
+      // If there was a line ending
+      if (firstLineEnd > 0) {
+        // Calculate the new logBufferFilled value
+        this->logBufferFilled = logBufferFilled - firstLineEnd;
+        // Now we move the lines infront of the buffer
+        memcpy(this->logBuffer, &this->logBuffer[firstLineEnd], logBufferFilled);
+      } else {
+        // Let's reuse the buffer if it was full
+        if (!bufferNotFull) {
+          this->logBufferFilled = 0;
+        }// else {
+        //  Nothing to do here
+        //}
+      }
+      write(c);
+    }
+  }
+  // We are always writing all uint8_t to the buffer
+  return 1;
+}
+
+size_t OLEDDisplay::write(const char* str) {
+  if (str == NULL) return 0;
+  size_t length = strlen(str);
+  for (size_t i = 0; i < length; i++) {
+    write(str[i]);
+  }
+  return length;
+}
+
+// Private functions
+void OLEDDisplay::sendInitCommands(void) {
+  sendCommand(DISPLAYOFF);
+  sendCommand(SETDISPLAYCLOCKDIV);
+  sendCommand(0xF0); // Increase speed of the display max ~96Hz
+  sendCommand(SETMULTIPLEX);
+  sendCommand(0x3F);
+  sendCommand(SETDISPLAYOFFSET);
+  sendCommand(0x00);
+  sendCommand(SETSTARTLINE);
+  sendCommand(CHARGEPUMP);
+  sendCommand(0x14);
+  sendCommand(MEMORYMODE);
+  sendCommand(0x00);
+  sendCommand(SEGREMAP);
+  sendCommand(COMSCANINC);
+  sendCommand(SETCOMPINS);
+  sendCommand(0x12);
+  sendCommand(SETCONTRAST);
+  sendCommand(0xCF);
+  sendCommand(SETPRECHARGE);
+  sendCommand(0xF1);
+  sendCommand(DISPLAYALLON_RESUME);
+  sendCommand(NORMALDISPLAY);
+  sendCommand(0x2e);            // stop scroll
+  sendCommand(DISPLAYON);
+}
+
+void inline OLEDDisplay::drawInternal(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *data, uint16_t offset, uint16_t bytesInData) {
+  if (width < 0 || height < 0) return;
+  if (yMove + height < 0 || yMove > DISPLAY_HEIGHT)  return;
+  if (xMove + width  < 0 || xMove > DISPLAY_WIDTH)   return;
+
+  uint8_t  rasterHeight = 1 + ((height - 1) >> 3); // fast ceil(height / 8.0)
+  int8_t   yOffset      = yMove & 7;
+
+  bytesInData = bytesInData == 0 ? width * rasterHeight : bytesInData;
+
+  int16_t initYMove   = yMove;
+  int8_t  initYOffset = yOffset;
+
+
+  for (uint16_t i = 0; i < bytesInData; i++) {
+
+    // Reset if next horizontal drawing phase is started.
+    if ( i % rasterHeight == 0) {
+      yMove   = initYMove;
+      yOffset = initYOffset;
+    }
+
+    byte currentByte = pgm_read_byte(data + offset + i);
+
+    int16_t xPos = xMove + (i / rasterHeight);
+    int16_t yPos = ((yMove >> 3) + (i % rasterHeight)) * DISPLAY_WIDTH;
+
+    int16_t yScreenPos = yMove + yOffset;
+    int16_t dataPos    = xPos  + yPos;
+
+    if (dataPos >=  0  && dataPos < DISPLAY_BUFFER_SIZE &&
+        xPos    >=  0  && xPos    < DISPLAY_WIDTH ) {
+
+      if (yOffset >= 0) {
+        switch (this->color) {
+          case WHITE:   buffer[dataPos] |= currentByte << yOffset; break;
+          case BLACK:   buffer[dataPos] &= currentByte << yOffset; break;
+          case INVERSE: buffer[dataPos] ^= currentByte << yOffset; break;
+        }
+        if (dataPos < (DISPLAY_BUFFER_SIZE - DISPLAY_WIDTH)) {
+          switch (this->color) {
+            case WHITE:   buffer[dataPos + DISPLAY_WIDTH] |= currentByte >> (8 - yOffset); break;
+            case BLACK:   buffer[dataPos + DISPLAY_WIDTH] &= currentByte >> (8 - yOffset); break;
+            case INVERSE: buffer[dataPos + DISPLAY_WIDTH] ^= currentByte >> (8 - yOffset); break;
+          }
+        }
+      } else {
+        // Make new offset position
+        yOffset = -yOffset;
+
+        switch (this->color) {
+          case WHITE:   buffer[dataPos] |= currentByte >> yOffset; break;
+          case BLACK:   buffer[dataPos] &= currentByte >> yOffset; break;
+          case INVERSE: buffer[dataPos] ^= currentByte >> yOffset; break;
+        }
+
+        // Prepare for next iteration by moving one block up
+        yMove -= 8;
+
+        // and setting the new yOffset
+        yOffset = 8 - yOffset;
+      }
+
+      yield();
+    }
+  }
+}
+
+// Code form http://playground.arduino.cc/Main/Utf8ascii
+uint8_t OLEDDisplay::utf8ascii(byte ascii) {
+  static uint8_t LASTCHAR;
+
+  if ( ascii < 128 ) { // Standard ASCII-set 0..0x7F handling
+    LASTCHAR = 0;
+    return ascii;
+  }
+
+  uint8_t last = LASTCHAR;   // get last char
+  LASTCHAR = ascii;
+
+  switch (last) {    // conversion depnding on first UTF8-character
+    case 0xC2: return  (ascii);  break;
+    case 0xC3: return  (ascii | 0xC0);  break;
+    case 0x82: if (ascii == 0xAC) return (0x80);    // special case Euro-symbol
+  }
+
+  return  0; // otherwise: return zero, if character has to be ignored
+}
+
+// You need to free the char!
+char* OLEDDisplay::utf8ascii(String str) {
+  uint16_t k = 0;
+  uint16_t length = str.length() + 1;
+
+  // Copy the string into a char array
+  char* s = (char*) malloc(length * sizeof(char));
+  if(!s) {
+    DEBUG_OLEDDISPLAY("[OLEDDISPLAY][utf8ascii] Can't allocate another char array. Drop support for UTF-8.\n");
+    return (char*) str.c_str();
+  }
+  str.toCharArray(s, length);
+
+  length--;
+
+  for (uint16_t i=0; i < length; i++) {
+    char c = utf8ascii(s[i]);
+    if (c!=0) {
+      s[k++]=c;
+    }
+  }
+
+  s[k]=0;
+
+  // This will leak 's' be sure to free it in the calling function.
+  return s;
+}
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplay.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplay.h
new file mode 100644
index 0000000..9151682
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplay.h
@@ -0,0 +1,265 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef OLEDDISPLAY_h
+#define OLEDDISPLAY_h
+
+#include <Arduino.h>
+#include "OLEDDisplayFonts.h"
+
+//#define DEBUG_OLEDDISPLAY(...) Serial.printf( __VA_ARGS__ )
+
+#ifndef DEBUG_OLEDDISPLAY
+#define DEBUG_OLEDDISPLAY(...)
+#endif
+
+// Use DOUBLE BUFFERING by default
+#ifndef OLEDDISPLAY_REDUCE_MEMORY
+#define OLEDDISPLAY_DOUBLE_BUFFER
+#endif
+
+
+// Display settings
+#define DISPLAY_WIDTH 128
+#define DISPLAY_HEIGHT 64
+#define DISPLAY_BUFFER_SIZE 1024
+
+// Header Values
+#define JUMPTABLE_BYTES 4
+
+#define JUMPTABLE_LSB   1
+#define JUMPTABLE_SIZE  2
+#define JUMPTABLE_WIDTH 3
+#define JUMPTABLE_START 4
+
+#define WIDTH_POS 0
+#define HEIGHT_POS 1
+#define FIRST_CHAR_POS 2
+#define CHAR_NUM_POS 3
+
+
+// Display commands
+#define CHARGEPUMP 0x8D
+#define COLUMNADDR 0x21
+#define COMSCANDEC 0xC8
+#define COMSCANINC 0xC0
+#define DISPLAYALLON 0xA5
+#define DISPLAYALLON_RESUME 0xA4
+#define DISPLAYOFF 0xAE
+#define DISPLAYON 0xAF
+#define EXTERNALVCC 0x1
+#define INVERTDISPLAY 0xA7
+#define MEMORYMODE 0x20
+#define NORMALDISPLAY 0xA6
+#define PAGEADDR 0x22
+#define SEGREMAP 0xA0
+#define SETCOMPINS 0xDA
+#define SETCONTRAST 0x81
+#define SETDISPLAYCLOCKDIV 0xD5
+#define SETDISPLAYOFFSET 0xD3
+#define SETHIGHCOLUMN 0x10
+#define SETLOWCOLUMN 0x00
+#define SETMULTIPLEX 0xA8
+#define SETPRECHARGE 0xD9
+#define SETSEGMENTREMAP 0xA1
+#define SETSTARTLINE 0x40
+#define SETVCOMDETECT 0xDB
+#define SWITCHCAPVCC 0x2
+
+#ifndef _swap_int16_t
+#define _swap_int16_t(a, b) { int16_t t = a; a = b; b = t; }
+#endif
+
+enum OLEDDISPLAY_COLOR {
+  BLACK = 0,
+  WHITE = 1,
+  INVERSE = 2
+};
+
+enum OLEDDISPLAY_TEXT_ALIGNMENT {
+  TEXT_ALIGN_LEFT = 0,
+  TEXT_ALIGN_RIGHT = 1,
+  TEXT_ALIGN_CENTER = 2,
+  TEXT_ALIGN_CENTER_BOTH = 3
+};
+
+
+class OLEDDisplay : public Print {
+  public:
+    // Initialize the display
+    bool init();
+
+    // Free the memory used by the display
+    void end();
+
+    // Cycle through the initialization
+    void resetDisplay(void);
+
+    /* Drawing functions */
+    // Sets the color of all pixel operations
+    void setColor(OLEDDISPLAY_COLOR color);
+
+    // Draw a pixel at given position
+    void setPixel(int16_t x, int16_t y);
+
+    // Draw a line from position 0 to position 1
+    void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1);
+
+    // Draw the border of a rectangle at the given location
+    void drawRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+    // Fill the rectangle
+    void fillRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+    // Draw the border of a circle
+    void drawCircle(int16_t x, int16_t y, int16_t radius);
+
+    // Fill circle
+    void fillCircle(int16_t x, int16_t y, int16_t radius);
+
+    // Draw a line horizontally
+    void drawHorizontalLine(int16_t x, int16_t y, int16_t length);
+
+    // Draw a lin vertically
+    void drawVerticalLine(int16_t x, int16_t y, int16_t length);
+
+    // Draws a rounded progress bar with the outer dimensions given by width and height. Progress is 
+    // a unsigned byte value between 0 and 100
+    void drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress);
+
+    // Draw a bitmap in the internal image format
+    void drawFastImage(int16_t x, int16_t y, int16_t width, int16_t height, const char *image);
+
+    // Draw a XBM
+    void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, const char *xbm);
+
+    /* Text functions */
+
+    // Draws a string at the given location
+    void drawString(int16_t x, int16_t y, String text);
+
+    // Draws a String with a maximum width at the given location.
+    // If the given String is wider than the specified width
+    // The text will be wrapped to the next line at a space or dash
+    void drawStringMaxWidth(int16_t x, int16_t y, uint16_t maxLineWidth, String text);
+
+    // Returns the width of the const char* with the current
+    // font settings
+    uint16_t getStringWidth(const char* text, uint16_t length);
+
+    // Convencience method for the const char version
+    uint16_t getStringWidth(String text);
+
+    // Specifies relative to which anchor point
+    // the text is rendered. Available constants:
+    // TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER_BOTH
+    void setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment);
+
+    // Sets the current font. Available default fonts
+    // ArialMT_Plain_10, ArialMT_Plain_16, ArialMT_Plain_24
+    void setFont(const char *fontData);
+
+    /* Display functions */
+
+    // Turn the display on
+    void displayOn(void);
+
+    // Turn the display offs
+    void displayOff(void);
+
+    // Inverted display mode
+    void invertDisplay(void);
+
+    // Normal display mode
+    void normalDisplay(void);
+
+    // Set display contrast
+    void setContrast(char contrast);
+
+    // Turn the display upside down
+    void flipScreenVertically();
+
+    // Write the buffer to the display memory
+    virtual void display(void);
+
+    // Clear the local pixel buffer
+    void clear(void);
+
+    // Log buffer implementation
+
+    // This will define the lines and characters you can
+    // print to the screen. When you exeed the buffer size (lines * chars)
+    // the output may be truncated due to the size constraint.
+    bool setLogBuffer(uint16_t lines, uint16_t chars);
+
+    // Draw the log buffer at position (x, y)
+    void drawLogBuffer(uint16_t x, uint16_t y);
+
+    // Implementent needed function to be compatible with Print class
+    size_t write(uint8_t c);
+    size_t write(const char* s);
+
+    uint8_t            *buffer;
+
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+    uint8_t            *buffer_back;
+    #endif
+
+  protected:
+
+    OLEDDISPLAY_TEXT_ALIGNMENT   textAlignment = TEXT_ALIGN_LEFT;
+    OLEDDISPLAY_COLOR            color         = WHITE;
+
+    const char          *fontData              = ArialMT_Plain_10;
+
+    // State values for logBuffer
+    uint16_t   logBufferSize                   = 0;
+    uint16_t   logBufferFilled                 = 0;
+    uint16_t   logBufferLine                   = 0;
+    uint16_t   logBufferMaxLines               = 0;
+    char      *logBuffer                       = NULL;
+
+    // Send a command to the display (low level function)
+    virtual void sendCommand(uint8_t com);
+
+    // Connect to the display
+//    virtual bool connect();
+
+    // Send all the init commands
+    void sendInitCommands();
+
+    // converts utf8 characters to extended ascii
+    static char* utf8ascii(String s);
+    static byte utf8ascii(byte ascii);
+
+    void inline drawInternal(int16_t xMove, int16_t yMove, int16_t width, int16_t height, const char *data, uint16_t offset, uint16_t bytesInData) __attribute__((always_inline));
+
+    void drawStringInternal(int16_t xMove, int16_t yMove, char* text, uint16_t textLength, uint16_t textWidth);
+
+};
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayFonts.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayFonts.h
new file mode 100644
index 0000000..6dd21ef
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayFonts.h
@@ -0,0 +1,1274 @@
+#ifndef OLEDDISPLAYFONTS_h
+#define OLEDDISPLAYFONTS_h
+
+const char ArialMT_Plain_10[] PROGMEM = {
+  0x0A, // Width: 10
+  0x0D, // Height: 13
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table:
+  0xFF, 0xFF, 0x00, 0x03,  // 32:65535
+  0x00, 0x00, 0x04, 0x03,  // 33:0
+  0x00, 0x04, 0x05, 0x04,  // 34:4
+  0x00, 0x09, 0x09, 0x06,  // 35:9
+  0x00, 0x12, 0x0A, 0x06,  // 36:18
+  0x00, 0x1C, 0x10, 0x09,  // 37:28
+  0x00, 0x2C, 0x0E, 0x07,  // 38:44
+  0x00, 0x3A, 0x01, 0x02,  // 39:58
+  0x00, 0x3B, 0x06, 0x03,  // 40:59
+  0x00, 0x41, 0x06, 0x03,  // 41:65
+  0x00, 0x47, 0x05, 0x04,  // 42:71
+  0x00, 0x4C, 0x09, 0x06,  // 43:76
+  0x00, 0x55, 0x04, 0x03,  // 44:85
+  0x00, 0x59, 0x03, 0x03,  // 45:89
+  0x00, 0x5C, 0x04, 0x03,  // 46:92
+  0x00, 0x60, 0x05, 0x03,  // 47:96
+  0x00, 0x65, 0x0A, 0x06,  // 48:101
+  0x00, 0x6F, 0x08, 0x06,  // 49:111
+  0x00, 0x77, 0x0A, 0x06,  // 50:119
+  0x00, 0x81, 0x0A, 0x06,  // 51:129
+  0x00, 0x8B, 0x0B, 0x06,  // 52:139
+  0x00, 0x96, 0x0A, 0x06,  // 53:150
+  0x00, 0xA0, 0x0A, 0x06,  // 54:160
+  0x00, 0xAA, 0x09, 0x06,  // 55:170
+  0x00, 0xB3, 0x0A, 0x06,  // 56:179
+  0x00, 0xBD, 0x0A, 0x06,  // 57:189
+  0x00, 0xC7, 0x04, 0x03,  // 58:199
+  0x00, 0xCB, 0x04, 0x03,  // 59:203
+  0x00, 0xCF, 0x0A, 0x06,  // 60:207
+  0x00, 0xD9, 0x09, 0x06,  // 61:217
+  0x00, 0xE2, 0x09, 0x06,  // 62:226
+  0x00, 0xEB, 0x0B, 0x06,  // 63:235
+  0x00, 0xF6, 0x14, 0x0A,  // 64:246
+  0x01, 0x0A, 0x0E, 0x07,  // 65:266
+  0x01, 0x18, 0x0C, 0x07,  // 66:280
+  0x01, 0x24, 0x0C, 0x07,  // 67:292
+  0x01, 0x30, 0x0B, 0x07,  // 68:304
+  0x01, 0x3B, 0x0C, 0x07,  // 69:315
+  0x01, 0x47, 0x09, 0x06,  // 70:327
+  0x01, 0x50, 0x0D, 0x08,  // 71:336
+  0x01, 0x5D, 0x0C, 0x07,  // 72:349
+  0x01, 0x69, 0x04, 0x03,  // 73:361
+  0x01, 0x6D, 0x08, 0x05,  // 74:365
+  0x01, 0x75, 0x0E, 0x07,  // 75:373
+  0x01, 0x83, 0x0C, 0x06,  // 76:387
+  0x01, 0x8F, 0x10, 0x08,  // 77:399
+  0x01, 0x9F, 0x0C, 0x07,  // 78:415
+  0x01, 0xAB, 0x0E, 0x08,  // 79:427
+  0x01, 0xB9, 0x0B, 0x07,  // 80:441
+  0x01, 0xC4, 0x0E, 0x08,  // 81:452
+  0x01, 0xD2, 0x0C, 0x07,  // 82:466
+  0x01, 0xDE, 0x0C, 0x07,  // 83:478
+  0x01, 0xEA, 0x0B, 0x06,  // 84:490
+  0x01, 0xF5, 0x0C, 0x07,  // 85:501
+  0x02, 0x01, 0x0D, 0x07,  // 86:513
+  0x02, 0x0E, 0x11, 0x09,  // 87:526
+  0x02, 0x1F, 0x0E, 0x07,  // 88:543
+  0x02, 0x2D, 0x0D, 0x07,  // 89:557
+  0x02, 0x3A, 0x0C, 0x06,  // 90:570
+  0x02, 0x46, 0x06, 0x03,  // 91:582
+  0x02, 0x4C, 0x06, 0x03,  // 92:588
+  0x02, 0x52, 0x04, 0x03,  // 93:594
+  0x02, 0x56, 0x09, 0x05,  // 94:598
+  0x02, 0x5F, 0x0C, 0x06,  // 95:607
+  0x02, 0x6B, 0x03, 0x03,  // 96:619
+  0x02, 0x6E, 0x0A, 0x06,  // 97:622
+  0x02, 0x78, 0x0A, 0x06,  // 98:632
+  0x02, 0x82, 0x0A, 0x05,  // 99:642
+  0x02, 0x8C, 0x0A, 0x06,  // 100:652
+  0x02, 0x96, 0x0A, 0x06,  // 101:662
+  0x02, 0xA0, 0x05, 0x03,  // 102:672
+  0x02, 0xA5, 0x0A, 0x06,  // 103:677
+  0x02, 0xAF, 0x0A, 0x06,  // 104:687
+  0x02, 0xB9, 0x04, 0x02,  // 105:697
+  0x02, 0xBD, 0x04, 0x02,  // 106:701
+  0x02, 0xC1, 0x08, 0x05,  // 107:705
+  0x02, 0xC9, 0x04, 0x02,  // 108:713
+  0x02, 0xCD, 0x10, 0x08,  // 109:717
+  0x02, 0xDD, 0x0A, 0x06,  // 110:733
+  0x02, 0xE7, 0x0A, 0x06,  // 111:743
+  0x02, 0xF1, 0x0A, 0x06,  // 112:753
+  0x02, 0xFB, 0x0A, 0x06,  // 113:763
+  0x03, 0x05, 0x05, 0x03,  // 114:773
+  0x03, 0x0A, 0x08, 0x05,  // 115:778
+  0x03, 0x12, 0x06, 0x03,  // 116:786
+  0x03, 0x18, 0x0A, 0x06,  // 117:792
+  0x03, 0x22, 0x09, 0x05,  // 118:802
+  0x03, 0x2B, 0x0E, 0x07,  // 119:811
+  0x03, 0x39, 0x0A, 0x05,  // 120:825
+  0x03, 0x43, 0x09, 0x05,  // 121:835
+  0x03, 0x4C, 0x0A, 0x05,  // 122:844
+  0x03, 0x56, 0x06, 0x03,  // 123:854
+  0x03, 0x5C, 0x04, 0x03,  // 124:860
+  0x03, 0x60, 0x05, 0x03,  // 125:864
+  0x03, 0x65, 0x09, 0x06,  // 126:869
+  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 128:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 129:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 130:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 131:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 132:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 133:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 134:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 135:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 136:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 137:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 138:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 139:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 140:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 141:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 142:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 143:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 144:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 145:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 146:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 147:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 148:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 149:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 150:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 151:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 152:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 153:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 154:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 155:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 156:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 157:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 158:65535
+  0xFF, 0xFF, 0x00, 0x0A,  // 159:65535
+  0xFF, 0xFF, 0x00, 0x03,  // 160:65535
+  0x03, 0x6E, 0x04, 0x03,  // 161:878
+  0x03, 0x72, 0x0A, 0x06,  // 162:882
+  0x03, 0x7C, 0x0C, 0x06,  // 163:892
+  0x03, 0x88, 0x0A, 0x06,  // 164:904
+  0x03, 0x92, 0x0A, 0x06,  // 165:914
+  0x03, 0x9C, 0x04, 0x03,  // 166:924
+  0x03, 0xA0, 0x0A, 0x06,  // 167:928
+  0x03, 0xAA, 0x05, 0x03,  // 168:938
+  0x03, 0xAF, 0x0D, 0x07,  // 169:943
+  0x03, 0xBC, 0x07, 0x04,  // 170:956
+  0x03, 0xC3, 0x0A, 0x06,  // 171:963
+  0x03, 0xCD, 0x09, 0x06,  // 172:973
+  0x03, 0xD6, 0x03, 0x03,  // 173:982
+  0x03, 0xD9, 0x0D, 0x07,  // 174:985
+  0x03, 0xE6, 0x0B, 0x06,  // 175:998
+  0x03, 0xF1, 0x07, 0x04,  // 176:1009
+  0x03, 0xF8, 0x0A, 0x05,  // 177:1016
+  0x04, 0x02, 0x05, 0x03,  // 178:1026
+  0x04, 0x07, 0x05, 0x03,  // 179:1031
+  0x04, 0x0C, 0x05, 0x03,  // 180:1036
+  0x04, 0x11, 0x0A, 0x06,  // 181:1041
+  0x04, 0x1B, 0x09, 0x05,  // 182:1051
+  0x04, 0x24, 0x03, 0x03,  // 183:1060
+  0x04, 0x27, 0x06, 0x03,  // 184:1063
+  0x04, 0x2D, 0x05, 0x03,  // 185:1069
+  0x04, 0x32, 0x07, 0x04,  // 186:1074
+  0x04, 0x39, 0x0A, 0x06,  // 187:1081
+  0x04, 0x43, 0x10, 0x08,  // 188:1091
+  0x04, 0x53, 0x10, 0x08,  // 189:1107
+  0x04, 0x63, 0x10, 0x08,  // 190:1123
+  0x04, 0x73, 0x0A, 0x06,  // 191:1139
+  0x04, 0x7D, 0x0E, 0x07,  // 192:1149
+  0x04, 0x8B, 0x0E, 0x07,  // 193:1163
+  0x04, 0x99, 0x0E, 0x07,  // 194:1177
+  0x04, 0xA7, 0x0E, 0x07,  // 195:1191
+  0x04, 0xB5, 0x0E, 0x07,  // 196:1205
+  0x04, 0xC3, 0x0E, 0x07,  // 197:1219
+  0x04, 0xD1, 0x12, 0x0A,  // 198:1233
+  0x04, 0xE3, 0x0C, 0x07,  // 199:1251
+  0x04, 0xEF, 0x0C, 0x07,  // 200:1263
+  0x04, 0xFB, 0x0C, 0x07,  // 201:1275
+  0x05, 0x07, 0x0C, 0x07,  // 202:1287
+  0x05, 0x13, 0x0C, 0x07,  // 203:1299
+  0x05, 0x1F, 0x05, 0x03,  // 204:1311
+  0x05, 0x24, 0x04, 0x03,  // 205:1316
+  0x05, 0x28, 0x04, 0x03,  // 206:1320
+  0x05, 0x2C, 0x05, 0x03,  // 207:1324
+  0x05, 0x31, 0x0B, 0x07,  // 208:1329
+  0x05, 0x3C, 0x0C, 0x07,  // 209:1340
+  0x05, 0x48, 0x0E, 0x08,  // 210:1352
+  0x05, 0x56, 0x0E, 0x08,  // 211:1366
+  0x05, 0x64, 0x0E, 0x08,  // 212:1380
+  0x05, 0x72, 0x0E, 0x08,  // 213:1394
+  0x05, 0x80, 0x0E, 0x08,  // 214:1408
+  0x05, 0x8E, 0x0A, 0x06,  // 215:1422
+  0x05, 0x98, 0x0D, 0x08,  // 216:1432
+  0x05, 0xA5, 0x0C, 0x07,  // 217:1445
+  0x05, 0xB1, 0x0C, 0x07,  // 218:1457
+  0x05, 0xBD, 0x0C, 0x07,  // 219:1469
+  0x05, 0xC9, 0x0C, 0x07,  // 220:1481
+  0x05, 0xD5, 0x0D, 0x07,  // 221:1493
+  0x05, 0xE2, 0x0B, 0x07,  // 222:1506
+  0x05, 0xED, 0x0C, 0x06,  // 223:1517
+  0x05, 0xF9, 0x0A, 0x06,  // 224:1529
+  0x06, 0x03, 0x0A, 0x06,  // 225:1539
+  0x06, 0x0D, 0x0A, 0x06,  // 226:1549
+  0x06, 0x17, 0x0A, 0x06,  // 227:1559
+  0x06, 0x21, 0x0A, 0x06,  // 228:1569
+  0x06, 0x2B, 0x0A, 0x06,  // 229:1579
+  0x06, 0x35, 0x10, 0x09,  // 230:1589
+  0x06, 0x45, 0x0A, 0x05,  // 231:1605
+  0x06, 0x4F, 0x0A, 0x06,  // 232:1615
+  0x06, 0x59, 0x0A, 0x06,  // 233:1625
+  0x06, 0x63, 0x0A, 0x06,  // 234:1635
+  0x06, 0x6D, 0x0A, 0x06,  // 235:1645
+  0x06, 0x77, 0x05, 0x03,  // 236:1655
+  0x06, 0x7C, 0x04, 0x03,  // 237:1660
+  0x06, 0x80, 0x05, 0x03,  // 238:1664
+  0x06, 0x85, 0x05, 0x03,  // 239:1669
+  0x06, 0x8A, 0x0A, 0x06,  // 240:1674
+  0x06, 0x94, 0x0A, 0x06,  // 241:1684
+  0x06, 0x9E, 0x0A, 0x06,  // 242:1694
+  0x06, 0xA8, 0x0A, 0x06,  // 243:1704
+  0x06, 0xB2, 0x0A, 0x06,  // 244:1714
+  0x06, 0xBC, 0x0A, 0x06,  // 245:1724
+  0x06, 0xC6, 0x0A, 0x06,  // 246:1734
+  0x06, 0xD0, 0x09, 0x05,  // 247:1744
+  0x06, 0xD9, 0x0A, 0x06,  // 248:1753
+  0x06, 0xE3, 0x0A, 0x06,  // 249:1763
+  0x06, 0xED, 0x0A, 0x06,  // 250:1773
+  0x06, 0xF7, 0x0A, 0x06,  // 251:1783
+  0x07, 0x01, 0x0A, 0x06,  // 252:1793
+  0x07, 0x0B, 0x09, 0x05,  // 253:1803
+  0x07, 0x14, 0x0A, 0x06,  // 254:1812
+  0x07, 0x1E, 0x09, 0x05,  // 255:1822
+
+  // Font Data:
+  0x00,0x00,0xF8,0x02,  // 33
+  0x38,0x00,0x00,0x00,0x38, // 34
+  0xA0,0x03,0xE0,0x00,0xB8,0x03,0xE0,0x00,0xB8, // 35
+  0x30,0x01,0x28,0x02,0xF8,0x07,0x48,0x02,0x90,0x01,  // 36
+  0x00,0x00,0x30,0x00,0x48,0x00,0x30,0x03,0xC0,0x00,0xB0,0x01,0x48,0x02,0x80,0x01,  // 37
+  0x80,0x01,0x50,0x02,0x68,0x02,0xA8,0x02,0x18,0x01,0x80,0x03,0x80,0x02,  // 38
+  0x38, // 39
+  0xE0,0x03,0x10,0x04,0x08,0x08,  // 40
+  0x08,0x08,0x10,0x04,0xE0,0x03,  // 41
+  0x28,0x00,0x18,0x00,0x28, // 42
+  0x40,0x00,0x40,0x00,0xF0,0x01,0x40,0x00,0x40, // 43
+  0x00,0x00,0x00,0x06,  // 44
+  0x80,0x00,0x80, // 45
+  0x00,0x00,0x00,0x02,  // 46
+  0x00,0x03,0xE0,0x00,0x18, // 47
+  0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01,  // 48
+  0x00,0x00,0x20,0x00,0x10,0x00,0xF8,0x03,  // 49
+  0x10,0x02,0x08,0x03,0x88,0x02,0x48,0x02,0x30,0x02,  // 50
+  0x10,0x01,0x08,0x02,0x48,0x02,0x48,0x02,0xB0,0x01,  // 51
+  0xC0,0x00,0xA0,0x00,0x90,0x00,0x88,0x00,0xF8,0x03,0x80, // 52
+  0x60,0x01,0x38,0x02,0x28,0x02,0x28,0x02,0xC8,0x01,  // 53
+  0xF0,0x01,0x28,0x02,0x28,0x02,0x28,0x02,0xD0,0x01,  // 54
+  0x08,0x00,0x08,0x03,0xC8,0x00,0x38,0x00,0x08, // 55
+  0xB0,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0xB0,0x01,  // 56
+  0x70,0x01,0x88,0x02,0x88,0x02,0x88,0x02,0xF0,0x01,  // 57
+  0x00,0x00,0x20,0x02,  // 58
+  0x00,0x00,0x20,0x06,  // 59
+  0x00,0x00,0x40,0x00,0xA0,0x00,0xA0,0x00,0x10,0x01,  // 60
+  0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0,0x00,0xA0, // 61
+  0x00,0x00,0x10,0x01,0xA0,0x00,0xA0,0x00,0x40, // 62
+  0x10,0x00,0x08,0x00,0x08,0x00,0xC8,0x02,0x48,0x00,0x30, // 63
+  0x00,0x00,0xC0,0x03,0x30,0x04,0xD0,0x09,0x28,0x0A,0x28,0x0A,0xC8,0x0B,0x68,0x0A,0x10,0x05,0xE0,0x04,  // 64
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x88,0x00,0xB0,0x00,0xC0,0x01,0x00,0x02,  // 65
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0xF0,0x01,  // 66
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x10,0x01,  // 67
+  0x00,0x00,0xF8,0x03,0x08,0x02,0x08,0x02,0x10,0x01,0xE0, // 68
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,0x48,0x02,  // 69
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x08, // 70
+  0x00,0x00,0xE0,0x00,0x10,0x01,0x08,0x02,0x48,0x02,0x50,0x01,0xC0, // 71
+  0x00,0x00,0xF8,0x03,0x40,0x00,0x40,0x00,0x40,0x00,0xF8,0x03,  // 72
+  0x00,0x00,0xF8,0x03,  // 73
+  0x00,0x03,0x00,0x02,0x00,0x02,0xF8,0x01,  // 74
+  0x00,0x00,0xF8,0x03,0x80,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02,  // 75
+  0x00,0x00,0xF8,0x03,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,  // 76
+  0x00,0x00,0xF8,0x03,0x30,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x30,0x00,0xF8,0x03,  // 77
+  0x00,0x00,0xF8,0x03,0x30,0x00,0x40,0x00,0x80,0x01,0xF8,0x03,  // 78
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x02,0x08,0x02,0xF0,0x01,  // 79
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0x48,0x00,0x30, // 80
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x02,0x08,0x03,0x08,0x03,0xF0,0x02,  // 81
+  0x00,0x00,0xF8,0x03,0x48,0x00,0x48,0x00,0xC8,0x00,0x30,0x03,  // 82
+  0x00,0x00,0x30,0x01,0x48,0x02,0x48,0x02,0x48,0x02,0x90,0x01,  // 83
+  0x00,0x00,0x08,0x00,0x08,0x00,0xF8,0x03,0x08,0x00,0x08, // 84
+  0x00,0x00,0xF8,0x01,0x00,0x02,0x00,0x02,0x00,0x02,0xF8,0x01,  // 85
+  0x08,0x00,0x70,0x00,0x80,0x01,0x00,0x02,0x80,0x01,0x70,0x00,0x08, // 86
+  0x18,0x00,0xE0,0x01,0x00,0x02,0xF0,0x01,0x08,0x00,0xF0,0x01,0x00,0x02,0xE0,0x01,0x18, // 87
+  0x00,0x02,0x08,0x01,0x90,0x00,0x60,0x00,0x90,0x00,0x08,0x01,0x00,0x02,  // 88
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC0,0x03,0x20,0x00,0x10,0x00,0x08, // 89
+  0x08,0x03,0x88,0x02,0xC8,0x02,0x68,0x02,0x38,0x02,0x18,0x02,  // 90
+  0x00,0x00,0xF8,0x0F,0x08,0x08,  // 91
+  0x18,0x00,0xE0,0x00,0x00,0x03,  // 92
+  0x08,0x08,0xF8,0x0F,  // 93
+  0x40,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x40, // 94
+  0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,  // 95
+  0x08,0x00,0x10, // 96
+  0x00,0x00,0x00,0x03,0xA0,0x02,0xA0,0x02,0xE0,0x03,  // 97
+  0x00,0x00,0xF8,0x03,0x20,0x02,0x20,0x02,0xC0,0x01,  // 98
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0x40,0x01,  // 99
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xF8,0x03,  // 100
+  0x00,0x00,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02,  // 101
+  0x20,0x00,0xF0,0x03,0x28, // 102
+  0x00,0x00,0xC0,0x05,0x20,0x0A,0x20,0x0A,0xE0,0x07,  // 103
+  0x00,0x00,0xF8,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 104
+  0x00,0x00,0xE8,0x03,  // 105
+  0x00,0x08,0xE8,0x07,  // 106
+  0xF8,0x03,0x80,0x00,0xC0,0x01,0x20,0x02,  // 107
+  0x00,0x00,0xF8,0x03,  // 108
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 109
+  0x00,0x00,0xE0,0x03,0x20,0x00,0x20,0x00,0xC0,0x03,  // 110
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xC0,0x01,  // 111
+  0x00,0x00,0xE0,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01,  // 112
+  0x00,0x00,0xC0,0x01,0x20,0x02,0x20,0x02,0xE0,0x0F,  // 113
+  0x00,0x00,0xE0,0x03,0x20, // 114
+  0x40,0x02,0xA0,0x02,0xA0,0x02,0x20,0x01,  // 115
+  0x20,0x00,0xF8,0x03,0x20,0x02,  // 116
+  0x00,0x00,0xE0,0x01,0x00,0x02,0x00,0x02,0xE0,0x03,  // 117
+  0x20,0x00,0xC0,0x01,0x00,0x02,0xC0,0x01,0x20, // 118
+  0xE0,0x01,0x00,0x02,0xC0,0x01,0x20,0x00,0xC0,0x01,0x00,0x02,0xE0,0x01,  // 119
+  0x20,0x02,0x40,0x01,0x80,0x00,0x40,0x01,0x20,0x02,  // 120
+  0x20,0x00,0xC0,0x09,0x00,0x06,0xC0,0x01,0x20, // 121
+  0x20,0x02,0x20,0x03,0xA0,0x02,0x60,0x02,0x20,0x02,  // 122
+  0x80,0x00,0x78,0x0F,0x08,0x08,  // 123
+  0x00,0x00,0xF8,0x0F,  // 124
+  0x08,0x08,0x78,0x0F,0x80, // 125
+  0xC0,0x00,0x40,0x00,0xC0,0x00,0x80,0x00,0xC0, // 126
+  0x00,0x00,0xA0,0x0F,  // 161
+  0x00,0x00,0xC0,0x01,0xA0,0x0F,0x78,0x02,0x40,0x01,  // 162
+  0x40,0x02,0x70,0x03,0xC8,0x02,0x48,0x02,0x08,0x02,0x10,0x02,  // 163
+  0x00,0x00,0xE0,0x01,0x20,0x01,0x20,0x01,0xE0,0x01,  // 164
+  0x48,0x01,0x70,0x01,0xC0,0x03,0x70,0x01,0x48,0x01,  // 165
+  0x00,0x00,0x38,0x0F,  // 166
+  0xD0,0x04,0x28,0x09,0x48,0x09,0x48,0x0A,0x90,0x05,  // 167
+  0x08,0x00,0x00,0x00,0x08, // 168
+  0xE0,0x00,0x10,0x01,0x48,0x02,0xA8,0x02,0xA8,0x02,0x10,0x01,0xE0, // 169
+  0x68,0x00,0x68,0x00,0x68,0x00,0x78, // 170
+  0x00,0x00,0x80,0x01,0x40,0x02,0x80,0x01,0x40,0x02,  // 171
+  0x20,0x00,0x20,0x00,0x20,0x00,0x20,0x00,0xE0, // 172
+  0x80,0x00,0x80, // 173
+  0xE0,0x00,0x10,0x01,0xE8,0x02,0x68,0x02,0xC8,0x02,0x10,0x01,0xE0, // 174
+  0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02, // 175
+  0x00,0x00,0x38,0x00,0x28,0x00,0x38, // 176
+  0x40,0x02,0x40,0x02,0xF0,0x03,0x40,0x02,0x40,0x02,  // 177
+  0x48,0x00,0x68,0x00,0x58, // 178
+  0x48,0x00,0x58,0x00,0x68, // 179
+  0x00,0x00,0x10,0x00,0x08, // 180
+  0x00,0x00,0xE0,0x0F,0x00,0x02,0x00,0x02,0xE0,0x03,  // 181
+  0x70,0x00,0xF8,0x0F,0x08,0x00,0xF8,0x0F,0x08, // 182
+  0x00,0x00,0x40, // 183
+  0x00,0x00,0x00,0x14,0x00,0x18,  // 184
+  0x00,0x00,0x10,0x00,0x78, // 185
+  0x30,0x00,0x48,0x00,0x48,0x00,0x30, // 186
+  0x00,0x00,0x40,0x02,0x80,0x01,0x40,0x02,0x80,0x01,  // 187
+  0x00,0x00,0x10,0x02,0x78,0x01,0xC0,0x00,0x20,0x01,0x90,0x01,0xC8,0x03,0x00,0x01,  // 188
+  0x00,0x00,0x10,0x02,0x78,0x01,0x80,0x00,0x60,0x00,0x50,0x02,0x48,0x03,0xC0,0x02,  // 189
+  0x48,0x00,0x58,0x00,0x68,0x03,0x80,0x00,0x60,0x01,0x90,0x01,0xC8,0x03,0x00,0x01,  // 190
+  0x00,0x00,0x00,0x06,0x00,0x09,0xA0,0x09,0x00,0x04,  // 191
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 192
+  0x00,0x02,0xC0,0x01,0xB0,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02,  // 193
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x89,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 194
+  0x00,0x02,0xC2,0x01,0xB1,0x00,0x8A,0x00,0xB1,0x00,0xC0,0x01,0x00,0x02,  // 195
+  0x00,0x02,0xC0,0x01,0xB2,0x00,0x88,0x00,0xB2,0x00,0xC0,0x01,0x00,0x02,  // 196
+  0x00,0x02,0xC0,0x01,0xBE,0x00,0x8A,0x00,0xBE,0x00,0xC0,0x01,0x00,0x02,  // 197
+  0x00,0x03,0xC0,0x00,0xE0,0x00,0x98,0x00,0x88,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x48,0x02,  // 198
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x08,0x16,0x08,0x1A,0x10,0x01,  // 199
+  0x00,0x00,0xF8,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02,  // 200
+  0x00,0x00,0xF8,0x03,0x48,0x02,0x4A,0x02,0x49,0x02,0x48,0x02,  // 201
+  0x00,0x00,0xFA,0x03,0x49,0x02,0x4A,0x02,0x48,0x02,0x48,0x02,  // 202
+  0x00,0x00,0xF8,0x03,0x4A,0x02,0x48,0x02,0x4A,0x02,0x48,0x02,  // 203
+  0x00,0x00,0xF9,0x03,0x02, // 204
+  0x02,0x00,0xF9,0x03,  // 205
+  0x01,0x00,0xFA,0x03,  // 206
+  0x02,0x00,0xF8,0x03,0x02, // 207
+  0x40,0x00,0xF8,0x03,0x48,0x02,0x48,0x02,0x10,0x01,0xE0, // 208
+  0x00,0x00,0xFA,0x03,0x31,0x00,0x42,0x00,0x81,0x01,0xF8,0x03,  // 209
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x09,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01,  // 210
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x08,0x02,0xF0,0x01,  // 211
+  0x00,0x00,0xF0,0x01,0x08,0x02,0x0A,0x02,0x09,0x02,0x0A,0x02,0xF0,0x01,  // 212
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x09,0x02,0x0A,0x02,0x09,0x02,0xF0,0x01,  // 213
+  0x00,0x00,0xF0,0x01,0x0A,0x02,0x08,0x02,0x0A,0x02,0x08,0x02,0xF0,0x01,  // 214
+  0x10,0x01,0xA0,0x00,0xE0,0x00,0xA0,0x00,0x10,0x01,  // 215
+  0x00,0x00,0xF0,0x02,0x08,0x03,0xC8,0x02,0x28,0x02,0x18,0x03,0xE8, // 216
+  0x00,0x00,0xF8,0x01,0x01,0x02,0x02,0x02,0x00,0x02,0xF8,0x01,  // 217
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x00,0x02,0xF8,0x01,  // 218
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x01,0x02,0x02,0x02,0xF8,0x01,  // 219
+  0x00,0x00,0xF8,0x01,0x02,0x02,0x00,0x02,0x02,0x02,0xF8,0x01,  // 220
+  0x08,0x00,0x10,0x00,0x20,0x00,0xC2,0x03,0x21,0x00,0x10,0x00,0x08, // 221
+  0x00,0x00,0xF8,0x03,0x10,0x01,0x10,0x01,0x10,0x01,0xE0, // 222
+  0x00,0x00,0xF0,0x03,0x08,0x01,0x48,0x02,0xB0,0x02,0x80,0x01,  // 223
+  0x00,0x00,0x00,0x03,0xA4,0x02,0xA8,0x02,0xE0,0x03,  // 224
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE0,0x03,  // 225
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA4,0x02,0xE8,0x03,  // 226
+  0x00,0x00,0x08,0x03,0xA4,0x02,0xA8,0x02,0xE4,0x03,  // 227
+  0x00,0x00,0x00,0x03,0xA8,0x02,0xA0,0x02,0xE8,0x03,  // 228
+  0x00,0x00,0x00,0x03,0xAE,0x02,0xAA,0x02,0xEE,0x03,  // 229
+  0x00,0x00,0x40,0x03,0xA0,0x02,0xA0,0x02,0xC0,0x01,0xA0,0x02,0xA0,0x02,0xC0,0x02,  // 230
+  0x00,0x00,0xC0,0x01,0x20,0x16,0x20,0x1A,0x40,0x01,  // 231
+  0x00,0x00,0xC0,0x01,0xA4,0x02,0xA8,0x02,0xC0,0x02,  // 232
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC0,0x02,  // 233
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA4,0x02,0xC8,0x02,  // 234
+  0x00,0x00,0xC0,0x01,0xA8,0x02,0xA0,0x02,0xC8,0x02,  // 235
+  0x00,0x00,0xE4,0x03,0x08, // 236
+  0x08,0x00,0xE4,0x03,  // 237
+  0x08,0x00,0xE4,0x03,0x08, // 238
+  0x08,0x00,0xE0,0x03,0x08, // 239
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x38,0x02,0xE0,0x01,  // 240
+  0x00,0x00,0xE8,0x03,0x24,0x00,0x28,0x00,0xC4,0x03,  // 241
+  0x00,0x00,0xC0,0x01,0x24,0x02,0x28,0x02,0xC0,0x01,  // 242
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC0,0x01,  // 243
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x24,0x02,0xC8,0x01,  // 244
+  0x00,0x00,0xC8,0x01,0x24,0x02,0x28,0x02,0xC4,0x01,  // 245
+  0x00,0x00,0xC0,0x01,0x28,0x02,0x20,0x02,0xC8,0x01,  // 246
+  0x40,0x00,0x40,0x00,0x50,0x01,0x40,0x00,0x40, // 247
+  0x00,0x00,0xC0,0x02,0xA0,0x03,0x60,0x02,0xA0,0x01,  // 248
+  0x00,0x00,0xE0,0x01,0x04,0x02,0x08,0x02,0xE0,0x03,  // 249
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x04,0x02,0xE0,0x03,  // 250
+  0x00,0x00,0xE8,0x01,0x04,0x02,0x08,0x02,0xE0,0x03,  // 251
+  0x00,0x00,0xE0,0x01,0x08,0x02,0x00,0x02,0xE8,0x03,  // 252
+  0x20,0x00,0xC0,0x09,0x08,0x06,0xC4,0x01,0x20, // 253
+  0x00,0x00,0xF8,0x0F,0x20,0x02,0x20,0x02,0xC0,0x01,  // 254
+  0x20,0x00,0xC8,0x09,0x00,0x06,0xC8,0x01,0x20  // 255
+};
+
+const char ArialMT_Plain_16[] PROGMEM = {
+  0x10, // Width: 16
+  0x13, // Height: 19
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table:
+  0xFF, 0xFF, 0x00, 0x04,  // 32:65535
+  0x00, 0x00, 0x08, 0x04,  // 33:0
+  0x00, 0x08, 0x0D, 0x06,  // 34:8
+  0x00, 0x15, 0x1A, 0x09,  // 35:21
+  0x00, 0x2F, 0x17, 0x09,  // 36:47
+  0x00, 0x46, 0x26, 0x0E,  // 37:70
+  0x00, 0x6C, 0x1D, 0x0B,  // 38:108
+  0x00, 0x89, 0x04, 0x03,  // 39:137
+  0x00, 0x8D, 0x0C, 0x05,  // 40:141
+  0x00, 0x99, 0x0B, 0x05,  // 41:153
+  0x00, 0xA4, 0x0D, 0x06,  // 42:164
+  0x00, 0xB1, 0x17, 0x09,  // 43:177
+  0x00, 0xC8, 0x09, 0x04,  // 44:200
+  0x00, 0xD1, 0x0B, 0x05,  // 45:209
+  0x00, 0xDC, 0x08, 0x04,  // 46:220
+  0x00, 0xE4, 0x0A, 0x04,  // 47:228
+  0x00, 0xEE, 0x17, 0x09,  // 48:238
+  0x01, 0x05, 0x11, 0x09,  // 49:261
+  0x01, 0x16, 0x17, 0x09,  // 50:278
+  0x01, 0x2D, 0x17, 0x09,  // 51:301
+  0x01, 0x44, 0x17, 0x09,  // 52:324
+  0x01, 0x5B, 0x17, 0x09,  // 53:347
+  0x01, 0x72, 0x17, 0x09,  // 54:370
+  0x01, 0x89, 0x16, 0x09,  // 55:393
+  0x01, 0x9F, 0x17, 0x09,  // 56:415
+  0x01, 0xB6, 0x17, 0x09,  // 57:438
+  0x01, 0xCD, 0x05, 0x04,  // 58:461
+  0x01, 0xD2, 0x06, 0x04,  // 59:466
+  0x01, 0xD8, 0x17, 0x09,  // 60:472
+  0x01, 0xEF, 0x17, 0x09,  // 61:495
+  0x02, 0x06, 0x17, 0x09,  // 62:518
+  0x02, 0x1D, 0x16, 0x09,  // 63:541
+  0x02, 0x33, 0x2F, 0x10,  // 64:563
+  0x02, 0x62, 0x1D, 0x0B,  // 65:610
+  0x02, 0x7F, 0x1D, 0x0B,  // 66:639
+  0x02, 0x9C, 0x20, 0x0C,  // 67:668
+  0x02, 0xBC, 0x20, 0x0C,  // 68:700
+  0x02, 0xDC, 0x1D, 0x0B,  // 69:732
+  0x02, 0xF9, 0x19, 0x0A,  // 70:761
+  0x03, 0x12, 0x20, 0x0C,  // 71:786
+  0x03, 0x32, 0x1D, 0x0C,  // 72:818
+  0x03, 0x4F, 0x05, 0x04,  // 73:847
+  0x03, 0x54, 0x14, 0x08,  // 74:852
+  0x03, 0x68, 0x1D, 0x0B,  // 75:872
+  0x03, 0x85, 0x17, 0x09,  // 76:901
+  0x03, 0x9C, 0x23, 0x0D,  // 77:924
+  0x03, 0xBF, 0x1D, 0x0C,  // 78:959
+  0x03, 0xDC, 0x20, 0x0C,  // 79:988
+  0x03, 0xFC, 0x1C, 0x0B,  // 80:1020
+  0x04, 0x18, 0x20, 0x0C,  // 81:1048
+  0x04, 0x38, 0x1D, 0x0C,  // 82:1080
+  0x04, 0x55, 0x1D, 0x0B,  // 83:1109
+  0x04, 0x72, 0x19, 0x0A,  // 84:1138
+  0x04, 0x8B, 0x1D, 0x0C,  // 85:1163
+  0x04, 0xA8, 0x1C, 0x0B,  // 86:1192
+  0x04, 0xC4, 0x2B, 0x0F,  // 87:1220
+  0x04, 0xEF, 0x20, 0x0B,  // 88:1263
+  0x05, 0x0F, 0x19, 0x0B,  // 89:1295
+  0x05, 0x28, 0x1A, 0x0A,  // 90:1320
+  0x05, 0x42, 0x0C, 0x04,  // 91:1346
+  0x05, 0x4E, 0x0B, 0x04,  // 92:1358
+  0x05, 0x59, 0x09, 0x04,  // 93:1369
+  0x05, 0x62, 0x14, 0x08,  // 94:1378
+  0x05, 0x76, 0x1B, 0x09,  // 95:1398
+  0x05, 0x91, 0x07, 0x05,  // 96:1425
+  0x05, 0x98, 0x17, 0x09,  // 97:1432
+  0x05, 0xAF, 0x17, 0x09,  // 98:1455
+  0x05, 0xC6, 0x14, 0x08,  // 99:1478
+  0x05, 0xDA, 0x17, 0x09,  // 100:1498
+  0x05, 0xF1, 0x17, 0x09,  // 101:1521
+  0x06, 0x08, 0x0A, 0x04,  // 102:1544
+  0x06, 0x12, 0x17, 0x09,  // 103:1554
+  0x06, 0x29, 0x14, 0x09,  // 104:1577
+  0x06, 0x3D, 0x05, 0x04,  // 105:1597
+  0x06, 0x42, 0x06, 0x04,  // 106:1602
+  0x06, 0x48, 0x17, 0x08,  // 107:1608
+  0x06, 0x5F, 0x05, 0x04,  // 108:1631
+  0x06, 0x64, 0x23, 0x0D,  // 109:1636
+  0x06, 0x87, 0x14, 0x09,  // 110:1671
+  0x06, 0x9B, 0x17, 0x09,  // 111:1691
+  0x06, 0xB2, 0x17, 0x09,  // 112:1714
+  0x06, 0xC9, 0x18, 0x09,  // 113:1737
+  0x06, 0xE1, 0x0D, 0x05,  // 114:1761
+  0x06, 0xEE, 0x14, 0x08,  // 115:1774
+  0x07, 0x02, 0x0B, 0x04,  // 116:1794
+  0x07, 0x0D, 0x14, 0x09,  // 117:1805
+  0x07, 0x21, 0x13, 0x08,  // 118:1825
+  0x07, 0x34, 0x1F, 0x0C,  // 119:1844
+  0x07, 0x53, 0x14, 0x08,  // 120:1875
+  0x07, 0x67, 0x13, 0x08,  // 121:1895
+  0x07, 0x7A, 0x14, 0x08,  // 122:1914
+  0x07, 0x8E, 0x0F, 0x05,  // 123:1934
+  0x07, 0x9D, 0x06, 0x04,  // 124:1949
+  0x07, 0xA3, 0x0E, 0x05,  // 125:1955
+  0x07, 0xB1, 0x17, 0x09,  // 126:1969
+  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 128:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 129:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 130:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 131:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 132:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 133:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 134:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 135:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 136:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 137:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 138:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 139:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 140:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 141:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 142:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 143:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 144:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 145:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 146:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 147:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 148:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 149:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 150:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 151:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 152:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 153:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 154:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 155:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 156:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 157:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 158:65535
+  0xFF, 0xFF, 0x00, 0x10,  // 159:65535
+  0xFF, 0xFF, 0x00, 0x04,  // 160:65535
+  0x07, 0xC8, 0x09, 0x05,  // 161:1992
+  0x07, 0xD1, 0x17, 0x09,  // 162:2001
+  0x07, 0xE8, 0x17, 0x09,  // 163:2024
+  0x07, 0xFF, 0x14, 0x09,  // 164:2047
+  0x08, 0x13, 0x1A, 0x09,  // 165:2067
+  0x08, 0x2D, 0x06, 0x04,  // 166:2093
+  0x08, 0x33, 0x17, 0x09,  // 167:2099
+  0x08, 0x4A, 0x07, 0x05,  // 168:2122
+  0x08, 0x51, 0x23, 0x0C,  // 169:2129
+  0x08, 0x74, 0x0E, 0x06,  // 170:2164
+  0x08, 0x82, 0x14, 0x09,  // 171:2178
+  0x08, 0x96, 0x17, 0x09,  // 172:2198
+  0x08, 0xAD, 0x0B, 0x05,  // 173:2221
+  0x08, 0xB8, 0x23, 0x0C,  // 174:2232
+  0x08, 0xDB, 0x19, 0x09,  // 175:2267
+  0x08, 0xF4, 0x0D, 0x06,  // 176:2292
+  0x09, 0x01, 0x17, 0x09,  // 177:2305
+  0x09, 0x18, 0x0E, 0x05,  // 178:2328
+  0x09, 0x26, 0x0D, 0x05,  // 179:2342
+  0x09, 0x33, 0x0A, 0x05,  // 180:2355
+  0x09, 0x3D, 0x17, 0x09,  // 181:2365
+  0x09, 0x54, 0x19, 0x09,  // 182:2388
+  0x09, 0x6D, 0x08, 0x05,  // 183:2413
+  0x09, 0x75, 0x0C, 0x05,  // 184:2421
+  0x09, 0x81, 0x0B, 0x05,  // 185:2433
+  0x09, 0x8C, 0x0D, 0x06,  // 186:2444
+  0x09, 0x99, 0x17, 0x09,  // 187:2457
+  0x09, 0xB0, 0x26, 0x0D,  // 188:2480
+  0x09, 0xD6, 0x26, 0x0D,  // 189:2518
+  0x09, 0xFC, 0x26, 0x0D,  // 190:2556
+  0x0A, 0x22, 0x1A, 0x0A,  // 191:2594
+  0x0A, 0x3C, 0x1D, 0x0B,  // 192:2620
+  0x0A, 0x59, 0x1D, 0x0B,  // 193:2649
+  0x0A, 0x76, 0x1D, 0x0B,  // 194:2678
+  0x0A, 0x93, 0x1D, 0x0B,  // 195:2707
+  0x0A, 0xB0, 0x1D, 0x0B,  // 196:2736
+  0x0A, 0xCD, 0x1D, 0x0B,  // 197:2765
+  0x0A, 0xEA, 0x2C, 0x10,  // 198:2794
+  0x0B, 0x16, 0x20, 0x0C,  // 199:2838
+  0x0B, 0x36, 0x1D, 0x0B,  // 200:2870
+  0x0B, 0x53, 0x1D, 0x0B,  // 201:2899
+  0x0B, 0x70, 0x1D, 0x0B,  // 202:2928
+  0x0B, 0x8D, 0x1D, 0x0B,  // 203:2957
+  0x0B, 0xAA, 0x05, 0x04,  // 204:2986
+  0x0B, 0xAF, 0x07, 0x04,  // 205:2991
+  0x0B, 0xB6, 0x0A, 0x04,  // 206:2998
+  0x0B, 0xC0, 0x07, 0x04,  // 207:3008
+  0x0B, 0xC7, 0x20, 0x0C,  // 208:3015
+  0x0B, 0xE7, 0x1D, 0x0C,  // 209:3047
+  0x0C, 0x04, 0x20, 0x0C,  // 210:3076
+  0x0C, 0x24, 0x20, 0x0C,  // 211:3108
+  0x0C, 0x44, 0x20, 0x0C,  // 212:3140
+  0x0C, 0x64, 0x20, 0x0C,  // 213:3172
+  0x0C, 0x84, 0x20, 0x0C,  // 214:3204
+  0x0C, 0xA4, 0x17, 0x09,  // 215:3236
+  0x0C, 0xBB, 0x20, 0x0C,  // 216:3259
+  0x0C, 0xDB, 0x1D, 0x0C,  // 217:3291
+  0x0C, 0xF8, 0x1D, 0x0C,  // 218:3320
+  0x0D, 0x15, 0x1D, 0x0C,  // 219:3349
+  0x0D, 0x32, 0x1D, 0x0C,  // 220:3378
+  0x0D, 0x4F, 0x19, 0x0B,  // 221:3407
+  0x0D, 0x68, 0x1D, 0x0B,  // 222:3432
+  0x0D, 0x85, 0x17, 0x0A,  // 223:3461
+  0x0D, 0x9C, 0x17, 0x09,  // 224:3484
+  0x0D, 0xB3, 0x17, 0x09,  // 225:3507
+  0x0D, 0xCA, 0x17, 0x09,  // 226:3530
+  0x0D, 0xE1, 0x17, 0x09,  // 227:3553
+  0x0D, 0xF8, 0x17, 0x09,  // 228:3576
+  0x0E, 0x0F, 0x17, 0x09,  // 229:3599
+  0x0E, 0x26, 0x29, 0x0E,  // 230:3622
+  0x0E, 0x4F, 0x14, 0x08,  // 231:3663
+  0x0E, 0x63, 0x17, 0x09,  // 232:3683
+  0x0E, 0x7A, 0x17, 0x09,  // 233:3706
+  0x0E, 0x91, 0x17, 0x09,  // 234:3729
+  0x0E, 0xA8, 0x17, 0x09,  // 235:3752
+  0x0E, 0xBF, 0x05, 0x04,  // 236:3775
+  0x0E, 0xC4, 0x07, 0x04,  // 237:3780
+  0x0E, 0xCB, 0x0A, 0x04,  // 238:3787
+  0x0E, 0xD5, 0x07, 0x04,  // 239:3797
+  0x0E, 0xDC, 0x17, 0x09,  // 240:3804
+  0x0E, 0xF3, 0x14, 0x09,  // 241:3827
+  0x0F, 0x07, 0x17, 0x09,  // 242:3847
+  0x0F, 0x1E, 0x17, 0x09,  // 243:3870
+  0x0F, 0x35, 0x17, 0x09,  // 244:3893
+  0x0F, 0x4C, 0x17, 0x09,  // 245:3916
+  0x0F, 0x63, 0x17, 0x09,  // 246:3939
+  0x0F, 0x7A, 0x17, 0x09,  // 247:3962
+  0x0F, 0x91, 0x17, 0x0A,  // 248:3985
+  0x0F, 0xA8, 0x14, 0x09,  // 249:4008
+  0x0F, 0xBC, 0x14, 0x09,  // 250:4028
+  0x0F, 0xD0, 0x14, 0x09,  // 251:4048
+  0x0F, 0xE4, 0x14, 0x09,  // 252:4068
+  0x0F, 0xF8, 0x13, 0x08,  // 253:4088
+  0x10, 0x0B, 0x17, 0x09,  // 254:4107
+  0x10, 0x22, 0x13, 0x08,  // 255:4130
+
+  // Font Data:
+  0x00,0x00,0x00,0x00,0x00,0x00,0xF8,0x5F,  // 33
+  0x00,0x00,0x00,0x78,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78, // 34
+  0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,0x00,0x80,0x78,0x00,0xC0,0x0F,0x00,0xB8,0x08,0x00,0x80,0x08,  // 35
+  0x00,0x00,0x00,0xE0,0x10,0x00,0x10,0x21,0x00,0x08,0x41,0x00,0xFC,0xFF,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 36
+  0x00,0x00,0x00,0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x61,0x00,0xF0,0x18,0x00,0x00,0x06,0x00,0xC0,0x01,0x00,0x30,0x3C,0x00,0x08,0x42,0x00,0x00,0x42,0x00,0x00,0x42,0x00,0x00,0x3C,  // 37
+  0x00,0x00,0x00,0x00,0x1C,0x00,0x70,0x22,0x00,0x88,0x41,0x00,0x08,0x43,0x00,0x88,0x44,0x00,0x70,0x28,0x00,0x00,0x10,0x00,0x00,0x28,0x00,0x00,0x44, // 38
+  0x00,0x00,0x00,0x78,  // 39
+  0x00,0x00,0x00,0x80,0x3F,0x00,0x70,0xC0,0x01,0x08,0x00,0x02,  // 40
+  0x00,0x00,0x00,0x08,0x00,0x02,0x70,0xC0,0x01,0x80,0x3F, // 41
+  0x10,0x00,0x00,0xD0,0x00,0x00,0x38,0x00,0x00,0xD0,0x00,0x00,0x10, // 42
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0xC0,0x1F,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x01, // 44
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,  // 46
+  0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18,  // 47
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xE0,0x1F, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0xF8,0x7F, // 49
+  0x00,0x00,0x00,0x20,0x40,0x00,0x10,0x60,0x00,0x08,0x50,0x00,0x08,0x48,0x00,0x08,0x44,0x00,0x10,0x43,0x00,0xE0,0x40, // 50
+  0x00,0x00,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x88,0x41,0x00,0xF0,0x22,0x00,0x00,0x1C, // 51
+  0x00,0x0C,0x00,0x00,0x0A,0x00,0x00,0x09,0x00,0xC0,0x08,0x00,0x20,0x08,0x00,0x10,0x08,0x00,0xF8,0x7F,0x00,0x00,0x08, // 52
+  0x00,0x00,0x00,0xC0,0x11,0x00,0xB8,0x20,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x08,0x21,0x00,0x08,0x1E, // 53
+  0x00,0x00,0x00,0xE0,0x1F,0x00,0x10,0x21,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x88,0x40,0x00,0x10,0x21,0x00,0x20,0x1E, // 54
+  0x00,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x78,0x00,0x08,0x07,0x00,0xC8,0x00,0x00,0x28,0x00,0x00,0x18,  // 55
+  0x00,0x00,0x00,0x60,0x1C,0x00,0x90,0x22,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 56
+  0x00,0x00,0x00,0xE0,0x11,0x00,0x10,0x22,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x08,0x44,0x00,0x10,0x22,0x00,0xE0,0x1F, // 57
+  0x00,0x00,0x00,0x40,0x40, // 58
+  0x00,0x00,0x00,0x40,0xC0,0x01,  // 59
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x40,0x10, // 60
+  0x00,0x00,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08, // 61
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x05,0x00,0x00,0x02, // 62
+  0x00,0x00,0x00,0x60,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0x08,0x5C,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0,  // 63
+  0x00,0x00,0x00,0x00,0x3F,0x00,0xC0,0x40,0x00,0x20,0x80,0x00,0x10,0x1E,0x01,0x10,0x21,0x01,0x88,0x40,0x02,0x48,0x40,0x02,0x48,0x40,0x02,0x48,0x20,0x02,0x88,0x7C,0x02,0xC8,0x43,0x02,0x10,0x40,0x02,0x10,0x20,0x01,0x60,0x10,0x01,0x80,0x8F, // 64
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x08,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 65
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x90,0x22,0x00,0x60,0x1C, // 66
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,  // 67
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 68
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 69
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08, // 70
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x12,0x00,0x00,0x0E,  // 71
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0xF8,0x7F, // 72
+  0x00,0x00,0x00,0xF8,0x7F, // 73
+  0x00,0x00,0x00,0x00,0x38,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0xF8,0x3F,  // 74
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x04,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0x80,0x03,0x00,0x40,0x04,0x00,0x20,0x18,0x00,0x10,0x20,0x00,0x08,0x40, // 75
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40, // 76
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0xF8,0x7F, // 77
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x80,0x00,0x00,0x00,0x03,0x00,0x00,0x04,0x00,0x00,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 78
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 79
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x10,0x01,0x00,0xE0,  // 80
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x08,0x50,0x00,0x08,0x50,0x00,0x10,0x20,0x00,0x20,0x70,0x00,0xC0,0x4F,  // 81
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x02,0x00,0x08,0x06,0x00,0x08,0x1A,0x00,0x10,0x21,0x00,0xE0,0x40, // 82
+  0x00,0x00,0x00,0x60,0x10,0x00,0x90,0x20,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x10,0x22,0x00,0x20,0x1C, // 83
+  0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0x7F,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 84
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 85
+  0x00,0x00,0x00,0x18,0x00,0x00,0xE0,0x00,0x00,0x00,0x07,0x00,0x00,0x18,0x00,0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x07,0x00,0xE0,0x00,0x00,0x18,  // 86
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x03,0x00,0x70,0x00,0x00,0x08,0x00,0x00,0x70,0x00,0x00,0x80,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1E,0x00,0xE0,0x01,0x00,0x18, // 87
+  0x00,0x40,0x00,0x08,0x20,0x00,0x10,0x10,0x00,0x60,0x0C,0x00,0x80,0x02,0x00,0x00,0x01,0x00,0x80,0x02,0x00,0x60,0x0C,0x00,0x10,0x10,0x00,0x08,0x20,0x00,0x00,0x40,  // 88
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x00,0x7E,0x00,0x80,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 89
+  0x00,0x40,0x00,0x08,0x60,0x00,0x08,0x58,0x00,0x08,0x44,0x00,0x08,0x43,0x00,0x88,0x40,0x00,0x68,0x40,0x00,0x18,0x40,0x00,0x08,0x40,  // 90
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x08,0x00,0x02,0x08,0x00,0x02,  // 91
+  0x18,0x00,0x00,0xE0,0x01,0x00,0x00,0x1E,0x00,0x00,0x60, // 92
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF8,0xFF,0x03, // 93
+  0x00,0x01,0x00,0xC0,0x00,0x00,0x30,0x00,0x00,0x08,0x00,0x00,0x30,0x00,0x00,0xC0,0x00,0x00,0x00,0x01,  // 94
+  0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 95
+  0x00,0x00,0x00,0x08,0x00,0x00,0x10, // 96
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 97
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 98
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,  // 99
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xF8,0x7F, // 100
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 101
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x48,0x00,0x00,0x48,  // 102
+  0x00,0x00,0x00,0x00,0x1F,0x01,0x80,0x20,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x40,0x40,0x02,0x80,0x20,0x01,0xC0,0xFF, // 103
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,  // 104
+  0x00,0x00,0x00,0xC8,0x7F, // 105
+  0x00,0x00,0x02,0xC8,0xFF,0x01,  // 106
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x06,0x00,0x00,0x19,0x00,0x80,0x20,0x00,0x40,0x40, // 107
+  0x00,0x00,0x00,0xF8,0x7F, // 108
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F, // 109
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x80,0x7F,  // 110
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 111
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 112
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0xC0,0xFF,0x03,  // 113
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x80,0x00,0x00,0x40,0x00,0x00,0x40, // 114
+  0x00,0x00,0x00,0x80,0x23,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x38,  // 115
+  0x40,0x00,0x00,0xF0,0x7F,0x00,0x40,0x40,0x00,0x40,0x40, // 116
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 117
+  0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0, // 118
+  0xC0,0x00,0x00,0x00,0x1F,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x00,0x03,0x00,0xC0,0x00,0x00,0x00,0x03,0x00,0x00,0x1C,0x00,0x00,0x60,0x00,0x00,0x1F,0x00,0xC0, // 119
+  0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x40,0x40,  // 120
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x00,0xE0,0x01,0x00,0x38,0x00,0x00,0x07,0x00,0xC0, // 121
+  0x40,0x40,0x00,0x40,0x60,0x00,0x40,0x58,0x00,0x40,0x44,0x00,0x40,0x43,0x00,0xC0,0x40,0x00,0x40,0x40,  // 122
+  0x00,0x04,0x00,0x00,0x04,0x00,0xF0,0xFB,0x01,0x08,0x00,0x02,0x08,0x00,0x02, // 123
+  0x00,0x00,0x00,0xF8,0xFF,0x03,  // 124
+  0x08,0x00,0x02,0x08,0x00,0x02,0xF0,0xFB,0x01,0x00,0x04,0x00,0x00,0x04,  // 125
+  0x00,0x02,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01, // 126
+  0x00,0x00,0x00,0x00,0x00,0x00,0x40,0xFF,0x03, // 161
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x03,0x40,0xF0,0x00,0x40,0x4E,0x00,0xC0,0x41,0x00,0xB8,0x20,0x00,0x00,0x11, // 162
+  0x00,0x41,0x00,0xE0,0x31,0x00,0x10,0x2F,0x00,0x08,0x21,0x00,0x08,0x21,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x20,0x20, // 163
+  0x00,0x00,0x00,0x40,0x0B,0x00,0x80,0x04,0x00,0x40,0x08,0x00,0x40,0x08,0x00,0x80,0x04,0x00,0x40,0x0B,  // 164
+  0x08,0x0A,0x00,0x10,0x0A,0x00,0x60,0x0A,0x00,0x80,0x0B,0x00,0x00,0x7E,0x00,0x80,0x0B,0x00,0x60,0x0A,0x00,0x10,0x0A,0x00,0x08,0x0A,  // 165
+  0x00,0x00,0x00,0xF8,0xF1,0x03,  // 166
+  0x00,0x86,0x00,0x70,0x09,0x01,0xC8,0x10,0x02,0x88,0x10,0x02,0x08,0x21,0x02,0x08,0x61,0x02,0x30,0xD2,0x01,0x00,0x0C, // 167
+  0x08,0x00,0x00,0x00,0x00,0x00,0x08, // 168
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xC8,0x47,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x28,0x48,0x00,0x48,0x44,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 169
+  0xD0,0x00,0x00,0x48,0x01,0x00,0x28,0x01,0x00,0x28,0x01,0x00,0xF0,0x01,  // 170
+  0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,0x00,0x00,0x04,0x00,0x00,0x1B,0x00,0x80,0x20,  // 171
+  0x00,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x00,0x00,0x80,0x0F, // 172
+  0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08,0x00,0x00,0x08, // 173
+  0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0xE8,0x4F,0x00,0x28,0x41,0x00,0x28,0x41,0x00,0x28,0x43,0x00,0x28,0x45,0x00,0xC8,0x48,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F, // 174
+  0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04,0x00,0x00,0x04, // 175
+  0x00,0x00,0x00,0x30,0x00,0x00,0x48,0x00,0x00,0x48,0x00,0x00,0x30, // 176
+  0x00,0x00,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0xE0,0x4F,0x00,0x00,0x41,0x00,0x00,0x41,0x00,0x00,0x41, // 177
+  0x10,0x01,0x00,0x88,0x01,0x00,0x48,0x01,0x00,0x48,0x01,0x00,0x30,0x01,  // 178
+  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x28,0x01,0x00,0xD8, // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x08,  // 180
+  0x00,0x00,0x00,0xC0,0xFF,0x03,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F, // 181
+  0xF0,0x00,0x00,0xF8,0x00,0x00,0xF8,0x01,0x00,0xF8,0x01,0x00,0xF8,0xFF,0x03,0x08,0x00,0x00,0x08,0x00,0x00,0xF8,0xFF,0x03,0x08, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,  // 183
+  0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x80,0x02,0x00,0x00,0x03,  // 184
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x00,0x00,0xF8,0x01, // 185
+  0xF0,0x00,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0x08,0x01,0x00,0xF0, // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04,0x00,0x80,0x20,0x00,0x00,0x1B,0x00,0x00,0x04, // 187
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x21,0x00,0x00,0x10,0x00,0x00,0x0C,0x00,0x00,0x02,0x00,0x80,0x01,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20,  // 188
+  0x00,0x00,0x00,0x10,0x00,0x00,0x08,0x40,0x00,0xF8,0x31,0x00,0x00,0x08,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x60,0x44,0x00,0x10,0x62,0x00,0x08,0x52,0x00,0x00,0x52,0x00,0x00,0x4C,  // 189
+  0x90,0x00,0x00,0x08,0x01,0x00,0x08,0x41,0x00,0x28,0x21,0x00,0xD8,0x18,0x00,0x00,0x04,0x00,0x00,0x03,0x00,0x80,0x00,0x00,0x40,0x30,0x00,0x30,0x28,0x00,0x08,0x24,0x00,0x00,0x7E,0x00,0x00,0x20,  // 190
+  0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x10,0x01,0x00,0x08,0x02,0x40,0x07,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x01,0x00,0xC0,  // 191
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x71,0x04,0x00,0x0A,0x04,0x00,0x70,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 192
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x70,0x04,0x00,0x0A,0x04,0x00,0x71,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 193
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x71,0x04,0x00,0x82,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 194
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x09,0x04,0x00,0x72,0x04,0x00,0x81,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 195
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x72,0x04,0x00,0x08,0x04,0x00,0x72,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 196
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x1C,0x00,0x80,0x07,0x00,0x7E,0x04,0x00,0x0A,0x04,0x00,0x7E,0x04,0x00,0x80,0x07,0x00,0x00,0x1C,0x00,0x00,0x60, // 197
+  0x00,0x60,0x00,0x00,0x18,0x00,0x00,0x06,0x00,0x80,0x05,0x00,0x60,0x04,0x00,0x18,0x04,0x00,0x08,0x04,0x00,0x08,0x04,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,  // 198
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x08,0x40,0x02,0x08,0xC0,0x02,0x08,0x40,0x03,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,  // 199
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 200
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 201
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x09,0x41,0x00,0x09,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 202
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x0A,0x41,0x00,0x08,0x41,0x00,0x08,0x41,0x00,0x08,0x40, // 203
+  0x01,0x00,0x00,0xFA,0x7F, // 204
+  0x00,0x00,0x00,0xFA,0x7F,0x00,0x01, // 205
+  0x02,0x00,0x00,0xF9,0x7F,0x00,0x01,0x00,0x00,0x02,  // 206
+  0x02,0x00,0x00,0xF8,0x7F,0x00,0x02, // 207
+  0x00,0x02,0x00,0xF8,0x7F,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x42,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 208
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x10,0x00,0x00,0x60,0x00,0x00,0x82,0x00,0x00,0x01,0x03,0x00,0x02,0x04,0x00,0x01,0x18,0x00,0x00,0x20,0x00,0xF8,0x7F, // 209
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 210
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 211
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 212
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x0A,0x40,0x00,0x09,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 213
+  0x00,0x00,0x00,0xC0,0x0F,0x00,0x20,0x10,0x00,0x10,0x20,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x08,0x40,0x00,0x0A,0x40,0x00,0x10,0x20,0x00,0x20,0x10,0x00,0xC0,0x0F,  // 214
+  0x00,0x00,0x00,0x40,0x10,0x00,0x80,0x08,0x00,0x00,0x05,0x00,0x00,0x07,0x00,0x00,0x05,0x00,0x80,0x08,0x00,0x40,0x10, // 215
+  0x00,0x00,0x00,0xC0,0x4F,0x00,0x20,0x30,0x00,0x10,0x30,0x00,0x08,0x4C,0x00,0x08,0x42,0x00,0x08,0x41,0x00,0xC8,0x40,0x00,0x30,0x20,0x00,0x30,0x10,0x00,0xC8,0x0F,  // 216
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 217
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 218
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x01,0x40,0x00,0x01,0x40,0x00,0x02,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 219
+  0x00,0x00,0x00,0xF8,0x1F,0x00,0x00,0x20,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x02,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xF8,0x1F, // 220
+  0x08,0x00,0x00,0x30,0x00,0x00,0x40,0x00,0x00,0x80,0x01,0x00,0x02,0x7E,0x00,0x81,0x01,0x00,0x40,0x00,0x00,0x30,0x00,0x00,0x08, // 221
+  0x00,0x00,0x00,0xF8,0x7F,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x20,0x10,0x00,0x40,0x08,0x00,0x80,0x07, // 222
+  0x00,0x00,0x00,0xE0,0x7F,0x00,0x10,0x00,0x00,0x08,0x20,0x00,0x88,0x43,0x00,0x70,0x42,0x00,0x00,0x44,0x00,0x00,0x38, // 223
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 224
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 225
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x42,0x00,0x50,0x22,0x00,0x80,0x7F, // 226
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x50,0x42,0x00,0x48,0x22,0x00,0x80,0x7F, // 227
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 228
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x5C,0x44,0x00,0x54,0x44,0x00,0x5C,0x42,0x00,0x40,0x22,0x00,0x80,0x7F, // 229
+  0x00,0x00,0x00,0x00,0x39,0x00,0x80,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x40,0x22,0x00,0x80,0x3F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 230
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x02,0x40,0xC0,0x02,0x40,0x40,0x03,0x80,0x20,  // 231
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x48,0x44,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 232
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 233
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x48,0x44,0x00,0x48,0x44,0x00,0x90,0x24,0x00,0x00,0x17, // 234
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x24,0x00,0x50,0x44,0x00,0x40,0x44,0x00,0x50,0x44,0x00,0x80,0x24,0x00,0x00,0x17, // 235
+  0x08,0x00,0x00,0xD0,0x7F, // 236
+  0x00,0x00,0x00,0xD0,0x7F,0x00,0x08, // 237
+  0x10,0x00,0x00,0xC8,0x7F,0x00,0x08,0x00,0x00,0x10,  // 238
+  0x10,0x00,0x00,0xC0,0x7F,0x00,0x10, // 239
+  0x00,0x00,0x00,0x00,0x1F,0x00,0xA0,0x20,0x00,0x68,0x40,0x00,0x58,0x40,0x00,0x70,0x40,0x00,0xE8,0x20,0x00,0x00,0x1F, // 240
+  0x00,0x00,0x00,0xC0,0x7F,0x00,0x90,0x00,0x00,0x48,0x00,0x00,0x50,0x00,0x00,0x48,0x00,0x00,0x80,0x7F,  // 241
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 242
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 243
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x48,0x40,0x00,0x90,0x20,0x00,0x00,0x1F, // 244
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x48,0x40,0x00,0x50,0x40,0x00,0x88,0x20,0x00,0x00,0x1F, // 245
+  0x00,0x00,0x00,0x00,0x1F,0x00,0x80,0x20,0x00,0x50,0x40,0x00,0x40,0x40,0x00,0x50,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 246
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x80,0x0A,0x00,0x00,0x02,0x00,0x00,0x02,0x00,0x00,0x02, // 247
+  0x00,0x00,0x00,0x00,0x5F,0x00,0x80,0x30,0x00,0x40,0x48,0x00,0x40,0x44,0x00,0x40,0x42,0x00,0x80,0x21,0x00,0x40,0x1F, // 248
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x08,0x40,0x00,0x10,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 249
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x00,0x40,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x08,0x20,0x00,0xC0,0x7F,  // 250
+  0x00,0x00,0x00,0xC0,0x3F,0x00,0x10,0x40,0x00,0x08,0x40,0x00,0x08,0x40,0x00,0x10,0x20,0x00,0xC0,0x7F,  // 251
+  0x00,0x00,0x00,0xD0,0x3F,0x00,0x00,0x40,0x00,0x10,0x40,0x00,0x00,0x40,0x00,0x00,0x20,0x00,0xC0,0x7F,  // 252
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x00,0x38,0x02,0x10,0xE0,0x01,0x08,0x38,0x00,0x00,0x07,0x00,0xC0, // 253
+  0x00,0x00,0x00,0xF8,0xFF,0x03,0x80,0x20,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x40,0x40,0x00,0x80,0x20,0x00,0x00,0x1F, // 254
+  0xC0,0x01,0x00,0x00,0x06,0x02,0x10,0x38,0x02,0x00,0xE0,0x01,0x10,0x38,0x00,0x00,0x07,0x00,0xC0  // 255
+};
+const char ArialMT_Plain_24[] PROGMEM = {
+  0x18, // Width: 24
+  0x1C, // Height: 28
+  0x20, // First Char: 32
+  0xE0, // Numbers of Chars: 224
+
+  // Jump Table:
+  0xFF, 0xFF, 0x00, 0x07,  // 32:65535
+  0x00, 0x00, 0x13, 0x07,  // 33:0
+  0x00, 0x13, 0x1A, 0x09,  // 34:19
+  0x00, 0x2D, 0x33, 0x0D,  // 35:45
+  0x00, 0x60, 0x2F, 0x0D,  // 36:96
+  0x00, 0x8F, 0x4F, 0x15,  // 37:143
+  0x00, 0xDE, 0x3B, 0x10,  // 38:222
+  0x01, 0x19, 0x0A, 0x05,  // 39:281
+  0x01, 0x23, 0x1C, 0x08,  // 40:291
+  0x01, 0x3F, 0x1B, 0x08,  // 41:319
+  0x01, 0x5A, 0x21, 0x09,  // 42:346
+  0x01, 0x7B, 0x32, 0x0E,  // 43:379
+  0x01, 0xAD, 0x10, 0x07,  // 44:429
+  0x01, 0xBD, 0x1B, 0x08,  // 45:445
+  0x01, 0xD8, 0x0F, 0x07,  // 46:472
+  0x01, 0xE7, 0x19, 0x07,  // 47:487
+  0x02, 0x00, 0x2F, 0x0D,  // 48:512
+  0x02, 0x2F, 0x23, 0x0D,  // 49:559
+  0x02, 0x52, 0x2F, 0x0D,  // 50:594
+  0x02, 0x81, 0x2F, 0x0D,  // 51:641
+  0x02, 0xB0, 0x2F, 0x0D,  // 52:688
+  0x02, 0xDF, 0x2F, 0x0D,  // 53:735
+  0x03, 0x0E, 0x2F, 0x0D,  // 54:782
+  0x03, 0x3D, 0x2D, 0x0D,  // 55:829
+  0x03, 0x6A, 0x2F, 0x0D,  // 56:874
+  0x03, 0x99, 0x2F, 0x0D,  // 57:921
+  0x03, 0xC8, 0x0F, 0x07,  // 58:968
+  0x03, 0xD7, 0x10, 0x07,  // 59:983
+  0x03, 0xE7, 0x2F, 0x0E,  // 60:999
+  0x04, 0x16, 0x2F, 0x0E,  // 61:1046
+  0x04, 0x45, 0x2E, 0x0E,  // 62:1093
+  0x04, 0x73, 0x2E, 0x0D,  // 63:1139
+  0x04, 0xA1, 0x5B, 0x18,  // 64:1185
+  0x04, 0xFC, 0x3B, 0x10,  // 65:1276
+  0x05, 0x37, 0x3B, 0x10,  // 66:1335
+  0x05, 0x72, 0x3F, 0x11,  // 67:1394
+  0x05, 0xB1, 0x3F, 0x11,  // 68:1457
+  0x05, 0xF0, 0x3B, 0x10,  // 69:1520
+  0x06, 0x2B, 0x35, 0x0F,  // 70:1579
+  0x06, 0x60, 0x43, 0x13,  // 71:1632
+  0x06, 0xA3, 0x3B, 0x11,  // 72:1699
+  0x06, 0xDE, 0x0F, 0x07,  // 73:1758
+  0x06, 0xED, 0x27, 0x0C,  // 74:1773
+  0x07, 0x14, 0x3F, 0x10,  // 75:1812
+  0x07, 0x53, 0x2F, 0x0D,  // 76:1875
+  0x07, 0x82, 0x43, 0x14,  // 77:1922
+  0x07, 0xC5, 0x3B, 0x11,  // 78:1989
+  0x08, 0x00, 0x47, 0x13,  // 79:2048
+  0x08, 0x47, 0x3A, 0x10,  // 80:2119
+  0x08, 0x81, 0x47, 0x13,  // 81:2177
+  0x08, 0xC8, 0x3F, 0x11,  // 82:2248
+  0x09, 0x07, 0x3B, 0x10,  // 83:2311
+  0x09, 0x42, 0x35, 0x0F,  // 84:2370
+  0x09, 0x77, 0x3B, 0x11,  // 85:2423
+  0x09, 0xB2, 0x39, 0x10,  // 86:2482
+  0x09, 0xEB, 0x59, 0x17,  // 87:2539
+  0x0A, 0x44, 0x3B, 0x10,  // 88:2628
+  0x0A, 0x7F, 0x3D, 0x10,  // 89:2687
+  0x0A, 0xBC, 0x37, 0x0F,  // 90:2748
+  0x0A, 0xF3, 0x14, 0x07,  // 91:2803
+  0x0B, 0x07, 0x1B, 0x07,  // 92:2823
+  0x0B, 0x22, 0x18, 0x07,  // 93:2850
+  0x0B, 0x3A, 0x2A, 0x0B,  // 94:2874
+  0x0B, 0x64, 0x34, 0x0D,  // 95:2916
+  0x0B, 0x98, 0x11, 0x08,  // 96:2968
+  0x0B, 0xA9, 0x2F, 0x0D,  // 97:2985
+  0x0B, 0xD8, 0x33, 0x0D,  // 98:3032
+  0x0C, 0x0B, 0x2B, 0x0C,  // 99:3083
+  0x0C, 0x36, 0x2F, 0x0D,  // 100:3126
+  0x0C, 0x65, 0x2F, 0x0D,  // 101:3173
+  0x0C, 0x94, 0x1A, 0x07,  // 102:3220
+  0x0C, 0xAE, 0x2F, 0x0D,  // 103:3246
+  0x0C, 0xDD, 0x2F, 0x0D,  // 104:3293
+  0x0D, 0x0C, 0x0F, 0x05,  // 105:3340
+  0x0D, 0x1B, 0x10, 0x05,  // 106:3355
+  0x0D, 0x2B, 0x2F, 0x0C,  // 107:3371
+  0x0D, 0x5A, 0x0F, 0x05,  // 108:3418
+  0x0D, 0x69, 0x47, 0x14,  // 109:3433
+  0x0D, 0xB0, 0x2F, 0x0D,  // 110:3504
+  0x0D, 0xDF, 0x2F, 0x0D,  // 111:3551
+  0x0E, 0x0E, 0x33, 0x0D,  // 112:3598
+  0x0E, 0x41, 0x30, 0x0D,  // 113:3649
+  0x0E, 0x71, 0x1E, 0x08,  // 114:3697
+  0x0E, 0x8F, 0x2B, 0x0C,  // 115:3727
+  0x0E, 0xBA, 0x1B, 0x07,  // 116:3770
+  0x0E, 0xD5, 0x2F, 0x0D,  // 117:3797
+  0x0F, 0x04, 0x2A, 0x0C,  // 118:3844
+  0x0F, 0x2E, 0x42, 0x11,  // 119:3886
+  0x0F, 0x70, 0x2B, 0x0C,  // 120:3952
+  0x0F, 0x9B, 0x2A, 0x0C,  // 121:3995
+  0x0F, 0xC5, 0x2B, 0x0C,  // 122:4037
+  0x0F, 0xF0, 0x1C, 0x08,  // 123:4080
+  0x10, 0x0C, 0x10, 0x06,  // 124:4108
+  0x10, 0x1C, 0x1B, 0x08,  // 125:4124
+  0x10, 0x37, 0x32, 0x0E,  // 126:4151
+  0xFF, 0xFF, 0x00, 0x00,  // 127:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 128:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 129:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 130:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 131:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 132:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 133:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 134:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 135:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 136:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 137:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 138:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 139:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 140:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 141:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 142:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 143:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 144:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 145:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 146:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 147:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 148:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 149:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 150:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 151:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 152:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 153:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 154:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 155:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 156:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 157:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 158:65535
+  0xFF, 0xFF, 0x00, 0x18,  // 159:65535
+  0xFF, 0xFF, 0x00, 0x07,  // 160:65535
+  0x10, 0x69, 0x14, 0x08,  // 161:4201
+  0x10, 0x7D, 0x2B, 0x0D,  // 162:4221
+  0x10, 0xA8, 0x2F, 0x0D,  // 163:4264
+  0x10, 0xD7, 0x33, 0x0D,  // 164:4311
+  0x11, 0x0A, 0x31, 0x0D,  // 165:4362
+  0x11, 0x3B, 0x10, 0x06,  // 166:4411
+  0x11, 0x4B, 0x2F, 0x0D,  // 167:4427
+  0x11, 0x7A, 0x19, 0x08,  // 168:4474
+  0x11, 0x93, 0x46, 0x12,  // 169:4499
+  0x11, 0xD9, 0x1A, 0x09,  // 170:4569
+  0x11, 0xF3, 0x27, 0x0D,  // 171:4595
+  0x12, 0x1A, 0x2F, 0x0E,  // 172:4634
+  0x12, 0x49, 0x1B, 0x08,  // 173:4681
+  0x12, 0x64, 0x46, 0x12,  // 174:4708
+  0x12, 0xAA, 0x31, 0x0D,  // 175:4778
+  0x12, 0xDB, 0x1E, 0x0A,  // 176:4827
+  0x12, 0xF9, 0x33, 0x0D,  // 177:4857
+  0x13, 0x2C, 0x1A, 0x08,  // 178:4908
+  0x13, 0x46, 0x1A, 0x08,  // 179:4934
+  0x13, 0x60, 0x19, 0x08,  // 180:4960
+  0x13, 0x79, 0x2F, 0x0E,  // 181:4985
+  0x13, 0xA8, 0x31, 0x0D,  // 182:5032
+  0x13, 0xD9, 0x12, 0x08,  // 183:5081
+  0x13, 0xEB, 0x18, 0x08,  // 184:5099
+  0x14, 0x03, 0x16, 0x08,  // 185:5123
+  0x14, 0x19, 0x1E, 0x09,  // 186:5145
+  0x14, 0x37, 0x2E, 0x0D,  // 187:5175
+  0x14, 0x65, 0x4F, 0x14,  // 188:5221
+  0x14, 0xB4, 0x4B, 0x14,  // 189:5300
+  0x14, 0xFF, 0x4B, 0x14,  // 190:5375
+  0x15, 0x4A, 0x33, 0x0F,  // 191:5450
+  0x15, 0x7D, 0x3B, 0x10,  // 192:5501
+  0x15, 0xB8, 0x3B, 0x10,  // 193:5560
+  0x15, 0xF3, 0x3B, 0x10,  // 194:5619
+  0x16, 0x2E, 0x3B, 0x10,  // 195:5678
+  0x16, 0x69, 0x3B, 0x10,  // 196:5737
+  0x16, 0xA4, 0x3B, 0x10,  // 197:5796
+  0x16, 0xDF, 0x5B, 0x18,  // 198:5855
+  0x17, 0x3A, 0x3F, 0x11,  // 199:5946
+  0x17, 0x79, 0x3B, 0x10,  // 200:6009
+  0x17, 0xB4, 0x3B, 0x10,  // 201:6068
+  0x17, 0xEF, 0x3B, 0x10,  // 202:6127
+  0x18, 0x2A, 0x3B, 0x10,  // 203:6186
+  0x18, 0x65, 0x11, 0x07,  // 204:6245
+  0x18, 0x76, 0x11, 0x07,  // 205:6262
+  0x18, 0x87, 0x15, 0x07,  // 206:6279
+  0x18, 0x9C, 0x15, 0x07,  // 207:6300
+  0x18, 0xB1, 0x3F, 0x11,  // 208:6321
+  0x18, 0xF0, 0x3B, 0x11,  // 209:6384
+  0x19, 0x2B, 0x47, 0x13,  // 210:6443
+  0x19, 0x72, 0x47, 0x13,  // 211:6514
+  0x19, 0xB9, 0x47, 0x13,  // 212:6585
+  0x1A, 0x00, 0x47, 0x13,  // 213:6656
+  0x1A, 0x47, 0x47, 0x13,  // 214:6727
+  0x1A, 0x8E, 0x2B, 0x0E,  // 215:6798
+  0x1A, 0xB9, 0x47, 0x13,  // 216:6841
+  0x1B, 0x00, 0x3B, 0x11,  // 217:6912
+  0x1B, 0x3B, 0x3B, 0x11,  // 218:6971
+  0x1B, 0x76, 0x3B, 0x11,  // 219:7030
+  0x1B, 0xB1, 0x3B, 0x11,  // 220:7089
+  0x1B, 0xEC, 0x3D, 0x10,  // 221:7148
+  0x1C, 0x29, 0x3A, 0x10,  // 222:7209
+  0x1C, 0x63, 0x37, 0x0F,  // 223:7267
+  0x1C, 0x9A, 0x2F, 0x0D,  // 224:7322
+  0x1C, 0xC9, 0x2F, 0x0D,  // 225:7369
+  0x1C, 0xF8, 0x2F, 0x0D,  // 226:7416
+  0x1D, 0x27, 0x2F, 0x0D,  // 227:7463
+  0x1D, 0x56, 0x2F, 0x0D,  // 228:7510
+  0x1D, 0x85, 0x2F, 0x0D,  // 229:7557
+  0x1D, 0xB4, 0x53, 0x15,  // 230:7604
+  0x1E, 0x07, 0x2B, 0x0C,  // 231:7687
+  0x1E, 0x32, 0x2F, 0x0D,  // 232:7730
+  0x1E, 0x61, 0x2F, 0x0D,  // 233:7777
+  0x1E, 0x90, 0x2F, 0x0D,  // 234:7824
+  0x1E, 0xBF, 0x2F, 0x0D,  // 235:7871
+  0x1E, 0xEE, 0x11, 0x07,  // 236:7918
+  0x1E, 0xFF, 0x11, 0x07,  // 237:7935
+  0x1F, 0x10, 0x15, 0x07,  // 238:7952
+  0x1F, 0x25, 0x15, 0x07,  // 239:7973
+  0x1F, 0x3A, 0x2F, 0x0D,  // 240:7994
+  0x1F, 0x69, 0x2F, 0x0D,  // 241:8041
+  0x1F, 0x98, 0x2F, 0x0D,  // 242:8088
+  0x1F, 0xC7, 0x2F, 0x0D,  // 243:8135
+  0x1F, 0xF6, 0x2F, 0x0D,  // 244:8182
+  0x20, 0x25, 0x2F, 0x0D,  // 245:8229
+  0x20, 0x54, 0x2F, 0x0D,  // 246:8276
+  0x20, 0x83, 0x32, 0x0D,  // 247:8323
+  0x20, 0xB5, 0x33, 0x0F,  // 248:8373
+  0x20, 0xE8, 0x2F, 0x0D,  // 249:8424
+  0x21, 0x17, 0x2F, 0x0D,  // 250:8471
+  0x21, 0x46, 0x2F, 0x0D,  // 251:8518
+  0x21, 0x75, 0x2F, 0x0D,  // 252:8565
+  0x21, 0xA4, 0x2A, 0x0C,  // 253:8612
+  0x21, 0xCE, 0x2F, 0x0D,  // 254:8654
+  0x21, 0xFD, 0x2A, 0x0C,  // 255:8701
+
+  // Font Data:
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x33,0x00,0xE0,0xFF,0x33, // 33
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,  // 34
+  0x00,0x0C,0x03,0x00,0x00,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x33,0x00,0x00,0x0C,0x3F,0x00,0x00,0xFC,0x0F,0x00,0x80,0xFF,0x03,0x00,0xE0,0x0F,0x03,0x00,0x60,0x0C,0x03,0x00,0x00,0x0C,0x03, // 35
+  0x00,0x00,0x00,0x00,0x80,0x07,0x06,0x00,0xC0,0x0F,0x1E,0x00,0xC0,0x18,0x1C,0x00,0x60,0x18,0x38,0x00,0x60,0x30,0x30,0x00,0xF0,0xFF,0xFF,0x00,0x60,0x30,0x30,0x00,0x60,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0xC1,0x1F,0x00,0x00,0x81,0x07, // 36
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x20,0x20,0x00,0x60,0x30,0x38,0x00,0xC0,0x1F,0x1E,0x00,0x80,0x8F,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x8F,0x0F,0x00,0xC0,0xC3,0x1F,0x00,0xE0,0x60,0x30,0x00,0x20,0x20,0x20,0x00,0x00,0x20,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F, // 37
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x00,0xC0,0x0F,0x00,0x80,0xE3,0x1C,0x00,0xC0,0x77,0x38,0x00,0xE0,0x3C,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x78,0x30,0x00,0xE0,0xEC,0x38,0x00,0xC0,0x8F,0x1B,0x00,0x80,0x03,0x1F,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xC0,0x38,0x00,0x00,0x00,0x10, // 38
+  0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xE0,0x07,  // 39
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x0F,0x00,0x00,0xFE,0x7F,0x00,0x80,0x0F,0xF0,0x01,0xC0,0x01,0x80,0x03,0x60,0x00,0x00,0x06,0x20,0x00,0x00,0x04,  // 40
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x04,0x60,0x00,0x00,0x06,0xC0,0x01,0x80,0x03,0x80,0x0F,0xF0,0x01,0x00,0xFE,0x7F,0x00,0x00,0xF0,0x0F, // 41
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x04,0x00,0x00,0x80,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x80,0x04,0x00,0x00,0x80, // 42
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xFF,0x0F,0x00,0x00,0xFF,0x0F,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,  // 43
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x03,0x00,0x00,0xF0,0x01,  // 44
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 45
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 46
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x3F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60, // 47
+  0x00,0x00,0x00,0x00,0x00,0xFE,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x01,0x1C,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x03, // 48
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 49
+  0x00,0x00,0x00,0x00,0x00,0x03,0x30,0x00,0xC0,0x03,0x38,0x00,0xC0,0x00,0x3C,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x33,0x00,0x60,0x80,0x31,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x30,0x00,0xC0,0x30,0x30,0x00,0xC0,0x1F,0x30,0x00,0x00,0x0F,0x30, // 50
+  0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x00,0xC0,0x01,0x0E,0x00,0xC0,0x00,0x1C,0x00,0x60,0x00,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x0F,0x00,0x00,0x80,0x07, // 51
+  0x00,0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x03,0x00,0x00,0x3C,0x03,0x00,0x00,0x0E,0x03,0x00,0x80,0x07,0x03,0x00,0xC0,0x01,0x03,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x03, // 52
+  0x00,0x00,0x00,0x00,0x00,0x30,0x06,0x00,0x80,0x3F,0x0E,0x00,0xE0,0x1F,0x18,0x00,0x60,0x08,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x0C,0x30,0x00,0x60,0x18,0x1C,0x00,0x60,0xF0,0x0F,0x00,0x00,0xE0,0x03, // 53
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x03,0x00,0x80,0xFF,0x0F,0x00,0xC0,0x63,0x1C,0x00,0xC0,0x30,0x38,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0x60,0x18,0x30,0x00,0xE0,0x30,0x18,0x00,0xC0,0xF1,0x0F,0x00,0x80,0xC1,0x07, // 54
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x3C,0x00,0x60,0x80,0x3F,0x00,0x60,0xE0,0x03,0x00,0x60,0x78,0x00,0x00,0x60,0x0E,0x00,0x00,0x60,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60, // 55
+  0x00,0x00,0x00,0x00,0x00,0x80,0x07,0x00,0x80,0xC7,0x1F,0x00,0xC0,0x6F,0x18,0x00,0xE0,0x38,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xE0,0x38,0x30,0x00,0xC0,0x6F,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 56
+  0x00,0x00,0x00,0x00,0x00,0x1F,0x0C,0x00,0x80,0x7F,0x1C,0x00,0xC0,0x61,0x38,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0xC0,0x30,0x00,0x60,0x60,0x18,0x00,0xC0,0x31,0x1E,0x00,0x80,0xFF,0x0F,0x00,0x00,0xFE,0x01, // 57
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 58
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x30,0x03,0x00,0x06,0xF0,0x01,  // 59
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x04,0x01,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x03,0x06, // 60
+  0x00,0x00,0x00,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01, // 61
+  0x00,0x00,0x00,0x00,0x00,0x03,0x06,0x00,0x00,0x06,0x03,0x00,0x00,0x06,0x03,0x00,0x00,0x04,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0x8C,0x01,0x00,0x00,0xD8,0x00,0x00,0x00,0xD8,0x00,0x00,0x00,0x50,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x20,  // 62
+  0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x33,0x00,0x60,0xE0,0x00,0x00,0x60,0x30,0x00,0x00,0xC0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x00,0x07,  // 63
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x0F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x1E,0xF0,0x00,0x00,0x07,0xC0,0x01,0x80,0xC3,0x87,0x01,0xC0,0xF1,0x9F,0x03,0xC0,0x38,0x18,0x03,0xC0,0x0C,0x30,0x03,0x60,0x0E,0x30,0x06,0x60,0x06,0x30,0x06,0x60,0x06,0x18,0x06,0x60,0x06,0x0C,0x06,0x60,0x0C,0x1E,0x06,0x60,0xF8,0x3F,0x06,0xE0,0xFE,0x31,0x06,0xC0,0x0E,0x30,0x06,0xC0,0x01,0x18,0x03,0x80,0x03,0x1C,0x03,0x00,0x07,0x8F,0x01,0x00,0xFE,0x87,0x01,0x00,0xF8,0xC1,0x00,0x00,0x00,0x40, // 64
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE0,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 65
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0xC0,0x78,0x30,0x00,0xC0,0xFF,0x18,0x00,0x80,0xC7,0x1F,0x00,0x00,0x80,0x07, // 66
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 67
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 68
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 69
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60, // 70
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x60,0x30,0x00,0x60,0x60,0x30,0x00,0xE0,0x60,0x38,0x00,0xC0,0x60,0x18,0x00,0xC0,0x61,0x18,0x00,0x80,0xE3,0x0F,0x00,0x00,0xE2,0x0F, // 71
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 72
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 73
+  0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0xE0,0xFF,0x1F,0x00,0xE0,0xFF,0x0F, // 74
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE7,0x01,0x00,0x80,0x83,0x07,0x00,0xC0,0x01,0x0F,0x00,0xE0,0x00,0x1E,0x00,0x60,0x00,0x38,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 75
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30, // 76
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x07,0x00,0x00,0xFE,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 77
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x0F,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 78
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 79
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0x60,0x60,0x00,0x00,0xC0,0x30,0x00,0x00,0xC0,0x3F,0x00,0x00,0x00,0x0F,  // 80
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x0C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x18,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x36,0x00,0x60,0x00,0x36,0x00,0xE0,0x00,0x3C,0x00,0xC0,0x00,0x1C,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x3F,0x00,0x00,0xFF,0x77,0x00,0x00,0xFC,0x61, // 81
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x70,0x00,0x00,0x60,0xF0,0x00,0x00,0x60,0xF0,0x03,0x00,0x60,0xB0,0x07,0x00,0xE0,0x18,0x1F,0x00,0xC0,0x1F,0x3C,0x00,0x80,0x0F,0x30,0x00,0x00,0x00,0x20, // 82
+  0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00,0x07,0x0F,0x00,0xC0,0x1F,0x1C,0x00,0xC0,0x18,0x18,0x00,0x60,0x38,0x38,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x70,0x30,0x00,0xC0,0x60,0x18,0x00,0xC0,0xE1,0x18,0x00,0x80,0xC3,0x0F,0x00,0x00,0x83,0x07, // 83
+  0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 84
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 85
+  0x20,0x00,0x00,0x00,0xE0,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x01,0x00,0x00,0xC0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xF8,0x01,0x00,0x00,0x3E,0x00,0x00,0xC0,0x0F,0x00,0x00,0xE0,0x01,0x00,0x00,0x20, // 86
+  0x60,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0x80,0xFF,0x00,0x00,0x00,0xF8,0x0F,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3F,0x00,0x00,0xE0,0x0F,0x00,0x00,0xFC,0x01,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x30,0x00,0x00,0x80,0x3F,0x00,0x00,0xF8,0x0F,0x00,0x80,0xFF,0x00,0x00,0xE0,0x07,0x00,0x00,0x60, // 87
+  0x00,0x00,0x20,0x00,0x20,0x00,0x30,0x00,0x60,0x00,0x3C,0x00,0xE0,0x01,0x1E,0x00,0xC0,0x83,0x07,0x00,0x00,0xCF,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0x38,0x00,0x00,0x00,0xFE,0x01,0x00,0x00,0xCF,0x03,0x00,0xC0,0x03,0x07,0x00,0xE0,0x01,0x1E,0x00,0x60,0x00,0x3C,0x00,0x20,0x00,0x30,0x00,0x00,0x00,0x20, // 88
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x3C,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 89
+  0x00,0x00,0x30,0x00,0x60,0x00,0x38,0x00,0x60,0x00,0x3C,0x00,0x60,0x00,0x37,0x00,0x60,0x80,0x33,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0x60,0x0E,0x30,0x00,0x60,0x07,0x30,0x00,0xE0,0x01,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x30, // 90
+  0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,  // 91
+  0x60,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x3F,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xE0,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 92
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,  // 93
+  0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xE0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x20,  // 94
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,  // 95
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x80, // 96
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 97
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 98
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 99
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 100
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 101
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x06,0x00,0x00,0x60,0x06,0x00,0x00,0x60,0x06,  // 102
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x83,0x01,0x00,0xF8,0x8F,0x03,0x00,0x1C,0x1C,0x07,0x00,0x0E,0x38,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x06,0x30,0x06,0x00,0x0C,0x18,0x07,0x00,0x18,0x8C,0x03,0x00,0xFE,0xFF,0x01,0x00,0xFE,0xFF, // 103
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 104
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F, // 105
+  0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x60,0xFE,0xFF,0x07,0x60,0xFE,0xFF,0x03,  // 106
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0xF0,0x01,0x00,0x00,0x98,0x07,0x00,0x00,0x0C,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x02,0x30,0x00,0x00,0x00,0x20, // 107
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 108
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 109
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 110
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 111
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x18,0x0C,0x00,0x00,0x0C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xE0,0x03, // 112
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0C,0x18,0x00,0x00,0x18,0x0C,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,  // 113
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0x00,0x0C,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x06,  // 114
+  0x00,0x00,0x00,0x00,0x00,0x38,0x0C,0x00,0x00,0x7C,0x1C,0x00,0x00,0xEE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x31,0x00,0x00,0xC6,0x31,0x00,0x00,0x8E,0x39,0x00,0x00,0x9C,0x1F,0x00,0x00,0x18,0x0F, // 115
+  0x00,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30, // 116
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 117
+  0x00,0x06,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xC0,0x07,0x00,0x00,0x00,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1F,0x00,0x00,0xC0,0x07,0x00,0x00,0xF8,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 118
+  0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xE0,0x03,0x00,0x00,0x7C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7C,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x80,0x1F,0x00,0x00,0xF0,0x03,0x00,0x00,0x7E,0x00,0x00,0x00,0x0E,  // 119
+  0x00,0x02,0x20,0x00,0x00,0x06,0x30,0x00,0x00,0x1E,0x3C,0x00,0x00,0x38,0x0E,0x00,0x00,0xF0,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x07,0x00,0x00,0x38,0x0E,0x00,0x00,0x1C,0x3C,0x00,0x00,0x0E,0x30,0x00,0x00,0x02,0x20, // 120
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0x00,0xC0,0x1F,0x00,0x00,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 121
+  0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x3E,0x00,0x00,0x06,0x37,0x00,0x00,0xC6,0x33,0x00,0x00,0xE6,0x30,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x30,0x00,0x00,0x1E,0x30,0x00,0x00,0x06,0x30, // 122
+  0x00,0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x03,0x00,0xC0,0x7F,0xFE,0x03,0xE0,0x3F,0xFC,0x07,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,  // 123
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x0F,0xE0,0xFF,0xFF,0x0F,  // 124
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x06,0x60,0x00,0x00,0x06,0xE0,0x3F,0xFC,0x07,0xC0,0x7F,0xFF,0x03,0x00,0xC0,0x03,0x00,0x00,0x80,0x01, // 125
+  0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,  // 126
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE6,0xFF,0x07,0x00,0xE6,0xFF,0x07,  // 161
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x9C,0x07,0x00,0x0E,0x78,0x00,0x00,0x06,0x3F,0x00,0x00,0xF6,0x30,0x00,0x00,0x0E,0x30,0x00,0xE0,0x0D,0x1C,0x00,0x00,0x1C,0x0E,0x00,0x00,0x10,0x06, // 162
+  0x00,0x60,0x10,0x00,0x00,0x60,0x38,0x00,0x00,0x7F,0x1C,0x00,0xC0,0xFF,0x1F,0x00,0xE0,0xE0,0x19,0x00,0x60,0x60,0x18,0x00,0x60,0x60,0x18,0x00,0x60,0x60,0x30,0x00,0xE0,0x00,0x30,0x00,0xC0,0x01,0x30,0x00,0x80,0x01,0x38,0x00,0x00,0x00,0x10, // 163
+  0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x00,0x00,0xF7,0x0E,0x00,0x00,0xFE,0x07,0x00,0x00,0x0C,0x03,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x06,0x06,0x00,0x00,0x0C,0x03,0x00,0x00,0xFE,0x07,0x00,0x00,0xF7,0x0E,0x00,0x00,0x02,0x04, // 164
+  0xE0,0x60,0x06,0x00,0xC0,0x61,0x06,0x00,0x80,0x67,0x06,0x00,0x00,0x7E,0x06,0x00,0x00,0x7C,0x06,0x00,0x00,0xF0,0x3F,0x00,0x00,0xF0,0x3F,0x00,0x00,0x7C,0x06,0x00,0x00,0x7E,0x06,0x00,0x80,0x67,0x06,0x00,0xC0,0x61,0x06,0x00,0xE0,0x60,0x06,0x00,0x20, // 165
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0x7F,0xF8,0x0F,0xE0,0x7F,0xF8,0x0F,  // 166
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x00,0x00,0x80,0xF3,0xC1,0x00,0xC0,0x1F,0xC3,0x03,0xE0,0x0C,0x07,0x03,0x60,0x1C,0x06,0x06,0x60,0x18,0x0C,0x06,0x60,0x30,0x1C,0x06,0xE0,0x70,0x38,0x07,0xC0,0xE1,0xF4,0x03,0x80,0xC1,0xE7,0x01,0x00,0x80,0x03, // 167
+  0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60, // 168
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x79,0x1C,0x00,0xC0,0xFE,0x19,0x00,0x60,0x86,0x31,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x03,0x33,0x00,0x60,0x87,0x33,0x00,0xC0,0x86,0x19,0x00,0xC0,0x85,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8,  // 169
+  0x00,0x00,0x00,0x00,0xC0,0x1C,0x00,0x00,0xE0,0x3E,0x00,0x00,0x60,0x32,0x00,0x00,0x60,0x32,0x00,0x00,0xE0,0x3F,0x00,0x00,0xC0,0x3F,  // 170
+  0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x84,0x10,0x00,0x00,0xE0,0x03,0x00,0x00,0x78,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x04,0x10, // 171
+  0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFC,0x01, // 172
+  0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01,0x00,0x00,0x80,0x01, // 173
+  0x00,0xF8,0x00,0x00,0x00,0xFE,0x03,0x00,0x00,0x07,0x07,0x00,0x80,0x01,0x0C,0x00,0xC0,0x01,0x1C,0x00,0xC0,0xFE,0x1B,0x00,0x60,0xFE,0x33,0x00,0x60,0x66,0x30,0x00,0x60,0x66,0x30,0x00,0x60,0xE6,0x30,0x00,0x60,0xFE,0x31,0x00,0x60,0x3C,0x33,0x00,0xC0,0x00,0x1A,0x00,0xC0,0x01,0x1C,0x00,0x80,0x01,0x0C,0x00,0x00,0x07,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xF8,  // 174
+  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x0C, // 175
+  0x00,0x00,0x00,0x00,0x80,0x03,0x00,0x00,0x40,0x04,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x20,0x08,0x00,0x00,0x40,0x04,0x00,0x00,0x80,0x03,  // 176
+  0x00,0x00,0x00,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0xFF,0x3F,0x00,0x00,0xFF,0x3F,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30,0x00,0x00,0x60,0x30, // 177
+  0x40,0x20,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x38,0x00,0x00,0x20,0x2C,0x00,0x00,0x20,0x26,0x00,0x00,0xE0,0x23,0x00,0x00,0xC0,0x21,  // 178
+  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x00,0x00,0x20,0x22,0x00,0x00,0xE0,0x3D,0x00,0x00,0xC0,0x1D,  // 179
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 180
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0xFF,0x07,0x00,0xFE,0xFF,0x07,0x00,0x00,0x1C,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x1C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 181
+  0x00,0x0F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xC0,0x3F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0x7F,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x60,0x00,0x00,0x00,0x60, // 182
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x60,  // 183
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0xC0,0x02,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,  // 184
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,  // 185
+  0x00,0x00,0x00,0x00,0x80,0x0F,0x00,0x00,0xC0,0x1F,0x00,0x00,0xE0,0x38,0x00,0x00,0x60,0x30,0x00,0x00,0xE0,0x38,0x00,0x00,0xC0,0x1F,0x00,0x00,0x80,0x0F,  // 186
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x84,0x10,0x00,0x00,0x1C,0x1C,0x00,0x00,0x78,0x0F,0x00,0x00,0xE0,0x03,0x00,0x00,0x80,  // 187
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x38,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x0C,0x00,0xC0,0x01,0x0E,0x00,0xE0,0x80,0x0B,0x00,0x60,0xC0,0x08,0x00,0x00,0xE0,0x3F,0x00,0x00,0xE0,0x3F,0x00,0x00,0x00,0x08, // 188
+  0x00,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xC0,0x00,0x00,0x00,0xC0,0x00,0x20,0x00,0xE0,0x3F,0x30,0x00,0xE0,0x3F,0x1C,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x01,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x4E,0x20,0x00,0x00,0x67,0x30,0x00,0xC0,0x21,0x38,0x00,0xE0,0x20,0x2C,0x00,0x60,0x20,0x26,0x00,0x00,0xE0,0x27,0x00,0x00,0xC0,0x21, // 189
+  0x40,0x10,0x00,0x00,0x60,0x30,0x00,0x00,0x20,0x20,0x00,0x00,0x20,0x22,0x20,0x00,0x20,0x22,0x30,0x00,0xE0,0x3D,0x38,0x00,0xC0,0x1D,0x0E,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xE0,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x0E,0x0C,0x00,0x00,0x07,0x0E,0x00,0x80,0x83,0x0B,0x00,0xE0,0xC0,0x08,0x00,0x60,0xE0,0x3F,0x00,0x20,0xE0,0x3F,0x00,0x00,0x00,0x08, // 190
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0xF8,0x03,0x00,0x00,0x1E,0x03,0x00,0x00,0x07,0x07,0x00,0xE6,0x03,0x06,0x00,0xE6,0x01,0x06,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0xC0,0x01,0x00,0x00,0xC0, // 191
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x82,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE8,0x83,0x01,0x00,0x80,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 192
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x80,0x8F,0x01,0x00,0xE8,0x83,0x01,0x00,0x6E,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x82,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 193
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x88,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xE6,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x08,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 194
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x0C,0xFE,0x01,0x00,0x8E,0x8F,0x01,0x00,0xE6,0x83,0x01,0x00,0x66,0x80,0x01,0x00,0xEC,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0E,0xFE,0x01,0x00,0x06,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 195
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x8C,0x8F,0x01,0x00,0xEC,0x83,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0x83,0x01,0x00,0x8C,0x8F,0x01,0x00,0x0C,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 196
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3E,0x00,0x00,0x80,0x0F,0x00,0x00,0xF0,0x03,0x00,0x00,0xFE,0x01,0x00,0x9C,0x8F,0x01,0x00,0xE2,0x83,0x01,0x00,0x62,0x80,0x01,0x00,0xE2,0x83,0x01,0x00,0x9C,0x8F,0x01,0x00,0x00,0xFE,0x01,0x00,0x00,0xF0,0x03,0x00,0x00,0x80,0x0F,0x00,0x00,0x00,0x3E,0x00,0x00,0x00,0x30, // 197
+  0x00,0x00,0x30,0x00,0x00,0x00,0x3C,0x00,0x00,0x00,0x0F,0x00,0x00,0xC0,0x03,0x00,0x00,0xF0,0x01,0x00,0x00,0xBC,0x01,0x00,0x00,0x8F,0x01,0x00,0xC0,0x83,0x01,0x00,0xE0,0x80,0x01,0x00,0x60,0x80,0x01,0x00,0x60,0x80,0x01,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 198
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0x60,0x00,0x30,0x02,0x60,0x00,0x30,0x02,0x60,0x00,0xF0,0x02,0x60,0x00,0xB0,0x03,0x60,0x00,0x30,0x01,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0F,0x00,0x00,0x02,0x03, // 199
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 200
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6E,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x62,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 201
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x66,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x68,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 202
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x6C,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30, // 203
+  0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xEE,0xFF,0x3F,0x00,0x08, // 204
+  0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0xEE,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x02, // 205
+  0x08,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE6,0xFF,0x3F,0x00,0xE6,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x08, // 206
+  0x0C,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x0C,0x00,0x00,0x00,0x0C, // 207
+  0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x30,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x03,0x0E,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 208
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0xC0,0x01,0x00,0x00,0x8C,0x03,0x00,0x00,0x0E,0x0E,0x00,0x00,0x06,0x3C,0x00,0x00,0x06,0x70,0x00,0x00,0x0C,0xE0,0x01,0x00,0x0C,0x80,0x03,0x00,0x0E,0x00,0x0F,0x00,0x06,0x00,0x1C,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F, // 209
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x62,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 210
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0x68,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x62,0x00,0x30,0x00,0xE0,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 211
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x68,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xE8,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 212
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xCC,0x00,0x18,0x00,0xEE,0x00,0x38,0x00,0x66,0x00,0x30,0x00,0x66,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x6E,0x00,0x30,0x00,0xE6,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 213
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x01,0x00,0x00,0xFF,0x07,0x00,0x80,0x07,0x0F,0x00,0xC0,0x01,0x1C,0x00,0xC0,0x00,0x18,0x00,0xE0,0x00,0x38,0x00,0x6C,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x6C,0x00,0x30,0x00,0xEC,0x00,0x38,0x00,0xC0,0x00,0x18,0x00,0xC0,0x01,0x1C,0x00,0x80,0x07,0x0F,0x00,0x00,0xFF,0x07,0x00,0x00,0xFC,0x01, // 214
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x03,0x00,0x00,0x8E,0x03,0x00,0x00,0xDC,0x01,0x00,0x00,0xF8,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0xDC,0x01,0x00,0x00,0x8E,0x03,0x00,0x00,0x06,0x03, // 215
+  0x00,0x00,0x00,0x00,0x00,0xFC,0x21,0x00,0x00,0xFF,0x77,0x00,0x80,0x07,0x3F,0x00,0xC0,0x01,0x1E,0x00,0xC0,0x00,0x1F,0x00,0xE0,0x80,0x3B,0x00,0x60,0xC0,0x31,0x00,0x60,0xE0,0x30,0x00,0x60,0x70,0x30,0x00,0x60,0x38,0x30,0x00,0x60,0x1C,0x30,0x00,0xE0,0x0E,0x38,0x00,0xC0,0x07,0x18,0x00,0xC0,0x03,0x1C,0x00,0xE0,0x07,0x0F,0x00,0x70,0xFF,0x07,0x00,0x20,0xFC,0x01, // 216
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x02,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 217
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x08,0x00,0x30,0x00,0x0E,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x02,0x00,0x30,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 218
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x08,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x06,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x08,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 219
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x03,0x00,0xE0,0xFF,0x0F,0x00,0x00,0x00,0x1C,0x00,0x00,0x00,0x38,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x0C,0x00,0x30,0x00,0x0C,0x00,0x38,0x00,0x00,0x00,0x1C,0x00,0xE0,0xFF,0x0F,0x00,0xE0,0xFF,0x03, // 220
+  0x20,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xC0,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x07,0x00,0x00,0x00,0x1E,0x00,0x00,0x00,0x3C,0x00,0x00,0x08,0xF0,0x3F,0x00,0x0E,0xF0,0x3F,0x00,0x06,0x3C,0x00,0x00,0x02,0x1E,0x00,0x00,0x00,0x07,0x00,0x00,0xC0,0x03,0x00,0x00,0xE0,0x01,0x00,0x00,0x60,0x00,0x00,0x00,0x20, // 221
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0x3F,0x00,0xE0,0xFF,0x3F,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x06,0x00,0x00,0x03,0x07,0x00,0x00,0x86,0x03,0x00,0x00,0xFE,0x01,0x00,0x00,0xF8,  // 222
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xFF,0x3F,0x00,0xC0,0xFF,0x3F,0x00,0xC0,0x00,0x00,0x00,0x60,0x00,0x08,0x00,0x60,0x00,0x1C,0x00,0x60,0x00,0x38,0x00,0xE0,0x78,0x30,0x00,0xC0,0x7F,0x30,0x00,0x80,0xC7,0x30,0x00,0x00,0x80,0x39,0x00,0x00,0x80,0x1F,0x00,0x00,0x00,0x0F, // 223
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x20,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x18,0x00,0x00,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 224
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x00,0x86,0x31,0x00,0x80,0x86,0x31,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x18,0x00,0x20,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 225
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x80,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0x60,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0x80,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 226
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0xC0,0x1C,0x1F,0x00,0xE0,0x8C,0x39,0x00,0x60,0x86,0x31,0x00,0x60,0x86,0x31,0x00,0xC0,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xE0,0xCE,0x0C,0x00,0x60,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 227
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0xC0,0x8C,0x39,0x00,0xC0,0x86,0x31,0x00,0x00,0x86,0x31,0x00,0x00,0xC6,0x30,0x00,0xC0,0xC6,0x18,0x00,0xC0,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 228
+  0x00,0x00,0x00,0x00,0x00,0x18,0x0E,0x00,0x00,0x1C,0x1F,0x00,0x00,0x8C,0x39,0x00,0x70,0x86,0x31,0x00,0x88,0x86,0x31,0x00,0x88,0xC6,0x30,0x00,0x88,0xC6,0x18,0x00,0x70,0xCE,0x0C,0x00,0x00,0xFC,0x1F,0x00,0x00,0xF8,0x3F,0x00,0x00,0x00,0x20, // 229
+  0x00,0x00,0x00,0x00,0x00,0x10,0x0F,0x00,0x00,0x9C,0x1F,0x00,0x00,0xCC,0x39,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0x66,0x18,0x00,0x00,0x6E,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xFC,0x1F,0x00,0x00,0xCC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xCC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xE0,0x04, // 230
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x02,0x00,0x06,0x30,0x02,0x00,0x06,0xF0,0x02,0x00,0x06,0xB0,0x03,0x00,0x0E,0x38,0x01,0x00,0x1C,0x1C,0x00,0x00,0x18,0x0C, // 231
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x20,0xCE,0x38,0x00,0x60,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x80,0xC6,0x30,0x00,0x00,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 232
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x00,0xCE,0x38,0x00,0x80,0xC6,0x30,0x00,0xE0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x20,0xCE,0x38,0x00,0x00,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 233
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0x80,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0x60,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0x80,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 234
+  0x00,0x00,0x00,0x00,0x00,0xE0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0xDC,0x1C,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0x00,0xC6,0x30,0x00,0xC0,0xCE,0x38,0x00,0xC0,0xDC,0x18,0x00,0x00,0xF8,0x0C,0x00,0x00,0xF0,0x04, // 235
+  0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0xE0,0xFE,0x3F,0x00,0x80, // 236
+  0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0xE0,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0x20, // 237
+  0x80,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x60,0xFE,0x3F,0x00,0x60,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0x80, // 238
+  0xC0,0x00,0x00,0x00,0xC0,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F,0x00,0xC0,0x00,0x00,0x00,0xC0, // 239
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1D,0x1C,0x00,0xA0,0x0F,0x38,0x00,0xA0,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0F,0x38,0x00,0x20,0x1F,0x1C,0x00,0x00,0xFC,0x0F,0x00,0x00,0xE0,0x07, // 240
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x3F,0x00,0xC0,0xFE,0x3F,0x00,0xE0,0x18,0x00,0x00,0x60,0x0C,0x00,0x00,0x60,0x06,0x00,0x00,0xC0,0x06,0x00,0x00,0xC0,0x06,0x00,0x00,0xE0,0x0E,0x00,0x00,0x60,0xFC,0x3F,0x00,0x00,0xF8,0x3F, // 241
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x20,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x80,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 242
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x38,0x00,0x80,0x06,0x30,0x00,0xE0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x20,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 243
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0x80,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0x80,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 244
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0xC0,0x1C,0x1C,0x00,0xE0,0x0E,0x38,0x00,0x60,0x06,0x30,0x00,0x60,0x06,0x30,0x00,0xC0,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xE0,0x1C,0x1C,0x00,0x60,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 245
+  0x00,0x00,0x00,0x00,0x00,0xF0,0x07,0x00,0x00,0xF8,0x0F,0x00,0x00,0x1C,0x1C,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0xC0,0x0E,0x38,0x00,0xC0,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x07, // 246
+  0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0xB6,0x01,0x00,0x00,0xB6,0x01,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,  // 247
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0x67,0x00,0x00,0xF8,0x7F,0x00,0x00,0x1C,0x1C,0x00,0x00,0x0E,0x3F,0x00,0x00,0x86,0x33,0x00,0x00,0xE6,0x31,0x00,0x00,0x76,0x30,0x00,0x00,0x3E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xFF,0x0F,0x00,0x00,0xF3,0x07, // 248
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x20,0x00,0x38,0x00,0x60,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 249
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x30,0x00,0x80,0x00,0x30,0x00,0xE0,0x00,0x30,0x00,0x60,0x00,0x18,0x00,0x20,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 250
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0x80,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0x60,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0x80,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 251
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0xFE,0x1F,0x00,0xC0,0x00,0x38,0x00,0xC0,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x30,0x00,0xC0,0x00,0x18,0x00,0xC0,0x00,0x0C,0x00,0x00,0xFE,0x3F,0x00,0x00,0xFE,0x3F, // 252
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0x00,0xF0,0x01,0x06,0x00,0x80,0x0F,0x07,0x80,0x00,0xFE,0x03,0xE0,0x00,0xFC,0x00,0x60,0xC0,0x1F,0x00,0x20,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06,  // 253
+  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xFF,0xFF,0x07,0xE0,0xFF,0xFF,0x07,0x00,0x1C,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x06,0x30,0x00,0x00,0x0E,0x38,0x00,0x00,0x1C,0x1C,0x00,0x00,0xF8,0x0F,0x00,0x00,0xF0,0x03, // 254
+  0x00,0x00,0x00,0x00,0x00,0x0E,0x00,0x00,0x00,0x7E,0x00,0x06,0xC0,0xF0,0x01,0x06,0xC0,0x80,0x0F,0x07,0x00,0x00,0xFE,0x03,0x00,0x00,0xFC,0x00,0xC0,0xC0,0x1F,0x00,0xC0,0xF8,0x03,0x00,0x00,0x3E,0x00,0x00,0x00,0x06 // 255
+};
+#endif 
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayUi.cpp b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayUi.cpp
new file mode 100644
index 0000000..f827c32
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayUi.cpp
@@ -0,0 +1,391 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include "OLEDDisplayUi.h"
+
+OLEDDisplayUi::OLEDDisplayUi(OLEDDisplay *display) {
+  this->display = display;
+}
+
+void OLEDDisplayUi::init() {
+  this->display->init();
+}
+
+void OLEDDisplayUi::setTargetFPS(uint8_t fps){
+  float oldInterval = this->updateInterval;
+  this->updateInterval = ((float) 1.0 / (float) fps) * 1000;
+
+  // Calculate new ticksPerFrame
+  float changeRatio = oldInterval / (float) this->updateInterval;
+  this->ticksPerFrame *= changeRatio;
+  this->ticksPerTransition *= changeRatio;
+}
+
+// -/------ Automatic controll ------\-
+
+void OLEDDisplayUi::enableAutoTransition(){
+  this->autoTransition = true;
+}
+void OLEDDisplayUi::disableAutoTransition(){
+  this->autoTransition = false;
+}
+void OLEDDisplayUi::setAutoTransitionForwards(){
+  this->state.frameTransitionDirection = 1;
+  this->lastTransitionDirection = 1;
+}
+void OLEDDisplayUi::setAutoTransitionBackwards(){
+  this->state.frameTransitionDirection = -1;
+  this->lastTransitionDirection = -1;
+}
+void OLEDDisplayUi::setTimePerFrame(uint16_t time){
+  this->ticksPerFrame = (int) ( (float) time / (float) updateInterval);
+}
+void OLEDDisplayUi::setTimePerTransition(uint16_t time){
+  this->ticksPerTransition = (int) ( (float) time / (float) updateInterval);
+}
+
+// -/------ Customize indicator position and style -------\-
+void OLEDDisplayUi::enableIndicator(){
+  this->state.isIndicatorDrawen = true;
+}
+
+void OLEDDisplayUi::disableIndicator(){
+  this->state.isIndicatorDrawen = false;
+}
+
+void OLEDDisplayUi::setIndicatorPosition(IndicatorPosition pos) {
+  this->indicatorPosition = pos;
+}
+void OLEDDisplayUi::setIndicatorDirection(IndicatorDirection dir) {
+  this->indicatorDirection = dir;
+}
+void OLEDDisplayUi::setActiveSymbol(const char* symbol) {
+  this->activeSymbol = symbol;
+}
+void OLEDDisplayUi::setInactiveSymbol(const char* symbol) {
+  this->inactiveSymbol = symbol;
+}
+
+
+// -/----- Frame settings -----\-
+void OLEDDisplayUi::setFrameAnimation(AnimationDirection dir) {
+  this->frameAnimationDirection = dir;
+}
+void OLEDDisplayUi::setFrames(FrameCallback* frameFunctions, uint8_t frameCount) {
+  this->frameFunctions = frameFunctions;
+  this->frameCount     = frameCount;
+  this->resetState();
+}
+
+// -/----- Overlays ------\-
+void OLEDDisplayUi::setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount){
+  this->overlayFunctions = overlayFunctions;
+  this->overlayCount     = overlayCount;
+}
+
+// -/----- Loading Process -----\-
+
+void OLEDDisplayUi::runLoadingProcess(LoadingStage* stages, uint8_t stagesCount) {
+  uint8_t progress = 0;
+  uint8_t increment = 100 / stagesCount;
+
+  for (uint8_t i = 0; i < stagesCount; i++) {
+    display->clear();
+    this->loadingDrawFunction(this->display, &stages[i], progress);
+    display->display();
+
+    stages[i].callback();
+
+    progress += increment;
+    yield();
+  }
+
+  display->clear();
+  this->loadingDrawFunction(this->display, &stages[stagesCount-1], progress);
+  display->display();
+
+  delay(150);
+}
+
+// -/----- Manuel control -----\-
+void OLEDDisplayUi::nextFrame() {
+  if (this->state.frameState != IN_TRANSITION) {
+    this->state.manuelControll = true;
+    this->state.frameState = IN_TRANSITION;
+    this->state.ticksSinceLastStateSwitch = 0;
+    this->lastTransitionDirection = this->state.frameTransitionDirection;
+    this->state.frameTransitionDirection = 1;
+  }
+}
+void OLEDDisplayUi::previousFrame() {
+  if (this->state.frameState != IN_TRANSITION) {
+    this->state.manuelControll = true;
+    this->state.frameState = IN_TRANSITION;
+    this->state.ticksSinceLastStateSwitch = 0;
+    this->lastTransitionDirection = this->state.frameTransitionDirection;
+    this->state.frameTransitionDirection = -1;
+  }
+}
+
+void OLEDDisplayUi::switchToFrame(uint8_t frame) {
+  if (frame >= this->frameCount || frame != this->state.currentFrame) return;
+  this->state.lastUpdate = 0;
+  this->state.ticksSinceLastStateSwitch = 0;
+  this->state.frameState = FIXED;
+  this->state.currentFrame = frame;
+  this->state.isIndicatorDrawen = true;
+}
+
+void OLEDDisplayUi::transitionToFrame(uint8_t frame) {
+  if (frame >= this->frameCount || frame != this->state.currentFrame) return;
+  this->nextFrameNumber = frame;
+  this->lastTransitionDirection = this->state.frameTransitionDirection;
+  this->state.manuelControll = true;
+  this->state.frameState = IN_TRANSITION;
+  this->state.ticksSinceLastStateSwitch = 0;
+  this->state.frameTransitionDirection = frame < this->state.currentFrame ? -1 : 1;
+}
+
+
+// -/----- State information -----\-
+OLEDDisplayUiState* OLEDDisplayUi::getUiState(){
+  return &this->state;
+}
+
+
+int8_t OLEDDisplayUi::update(){
+  long frameStart = millis();
+  int8_t timeBudget = this->updateInterval - (frameStart - this->state.lastUpdate);
+  if ( timeBudget <= 0) {
+    // Implement frame skipping to ensure time budget is keept
+    if (this->autoTransition && this->state.lastUpdate != 0) this->state.ticksSinceLastStateSwitch += ceil(-timeBudget / this->updateInterval);
+
+    this->state.lastUpdate = frameStart;
+    this->tick();
+  }
+  return this->updateInterval - (millis() - frameStart);
+}
+
+
+void OLEDDisplayUi::tick() {
+  this->state.ticksSinceLastStateSwitch++;
+
+  switch (this->state.frameState) {
+    case IN_TRANSITION:
+        if (this->state.ticksSinceLastStateSwitch >= this->ticksPerTransition){
+          this->state.frameState = FIXED;
+          this->state.currentFrame = getNextFrameNumber();
+          this->state.ticksSinceLastStateSwitch = 0;
+          this->nextFrameNumber = -1;
+        }
+      break;
+    case FIXED:
+      // Revert manuelControll
+      if (this->state.manuelControll) {
+        this->state.frameTransitionDirection = this->lastTransitionDirection;
+        this->state.manuelControll = false;
+      }
+      if (this->state.ticksSinceLastStateSwitch >= this->ticksPerFrame){
+          if (this->autoTransition){
+            this->state.frameState = IN_TRANSITION;
+          }
+          this->state.ticksSinceLastStateSwitch = 0;
+      }
+      break;
+  }
+
+  this->display->clear();
+  this->drawFrame();
+  this->drawIndicator();
+  this->drawOverlays();
+  this->display->display();
+}
+
+void OLEDDisplayUi::resetState() {
+  this->state.lastUpdate = 0;
+  this->state.ticksSinceLastStateSwitch = 0;
+  this->state.frameState = FIXED;
+  this->state.currentFrame = 0;
+  this->state.isIndicatorDrawen = true;
+}
+
+void OLEDDisplayUi::drawFrame(){
+  switch (this->state.frameState){
+     case IN_TRANSITION: {
+       float progress = (float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition;
+       int16_t x, y, x1, y1;
+       switch(this->frameAnimationDirection){
+        case SLIDE_LEFT:
+          x = -128 * progress;
+          y = 0;
+          x1 = x + 128;
+          y1 = 0;
+          break;
+        case SLIDE_RIGHT:
+          x = 128 * progress;
+          y = 0;
+          x1 = x - 128;
+          y1 = 0;
+          break;
+        case SLIDE_UP:
+          x = 0;
+          y = -64 * progress;
+          x1 = 0;
+          y1 = y + 64;
+          break;
+        case SLIDE_DOWN:
+          x = 0;
+          y = 64 * progress;
+          x1 = 0;
+          y1 = y - 64;
+          break;
+       }
+
+       // Invert animation if direction is reversed.
+       int8_t dir = this->state.frameTransitionDirection >= 0 ? 1 : -1;
+       x *= dir; y *= dir; x1 *= dir; y1 *= dir;
+
+       bool drawenCurrentFrame;
+
+
+       // Prope each frameFunction for the indicator Drawen state
+       this->enableIndicator();
+       (this->frameFunctions[this->state.currentFrame])(this->display, &this->state, x, y);
+       drawenCurrentFrame = this->state.isIndicatorDrawen;
+
+       this->enableIndicator();
+       (this->frameFunctions[this->getNextFrameNumber()])(this->display, &this->state, x1, y1);
+
+       // Build up the indicatorDrawState
+       if (drawenCurrentFrame && !this->state.isIndicatorDrawen) {
+         // Drawen now but not next
+         this->indicatorDrawState = 2;
+       } else if (!drawenCurrentFrame && this->state.isIndicatorDrawen) {
+         // Not drawen now but next
+         this->indicatorDrawState = 1;
+       } else if (!drawenCurrentFrame && !this->state.isIndicatorDrawen) {
+         // Not drawen in both frames
+         this->indicatorDrawState = 3;
+       }
+
+       // If the indicator isn't draw in the current frame
+       // reflect it in state.isIndicatorDrawen
+       if (!drawenCurrentFrame) this->state.isIndicatorDrawen = false;
+
+       break;
+     }
+     case FIXED:
+      // Always assume that the indicator is drawn!
+      // And set indicatorDrawState to "not known yet"
+      this->indicatorDrawState = 0;
+      this->enableIndicator();
+      (this->frameFunctions[this->state.currentFrame])(this->display, &this->state, 0, 0);
+      break;
+  }
+}
+
+void OLEDDisplayUi::drawIndicator() {
+
+    // Only draw if the indicator is invisible
+    // for both frames or
+    // the indiactor is shown and we are IN_TRANSITION
+    if (this->indicatorDrawState == 3 || (!this->state.isIndicatorDrawen && this->state.frameState != IN_TRANSITION)) {
+      return;
+    }
+
+    uint8_t posOfHighlightFrame;
+    float indicatorFadeProgress = 0;
+
+    // if the indicator needs to be slided in we want to
+    // highlight the next frame in the transition
+    uint8_t frameToHighlight = this->indicatorDrawState == 1 ? this->getNextFrameNumber() : this->state.currentFrame;
+
+    // Calculate the frame that needs to be highlighted
+    // based on the Direction the indiactor is drawn
+    switch (this->indicatorDirection){
+      case LEFT_RIGHT:
+        posOfHighlightFrame = frameToHighlight;
+        break;
+      case RIGHT_LEFT:
+        posOfHighlightFrame = this->frameCount - frameToHighlight;
+        break;
+    }
+
+    switch (this->indicatorDrawState) {
+      case 1: // Indicator was not drawn in this frame but will be in next
+        // Slide IN
+        indicatorFadeProgress = 1 - ((float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition);
+        break;
+      case 2: // Indicator was drawn in this frame but not in next
+        // Slide OUT
+        indicatorFadeProgress = ((float) this->state.ticksSinceLastStateSwitch / (float) this->ticksPerTransition);
+        break;
+    }
+
+    uint16_t frameStartPos = (12 * frameCount / 2);
+    const char *image;
+    uint16_t x,y;
+    for (byte i = 0; i < this->frameCount; i++) {
+
+      switch (this->indicatorPosition){
+        case TOP:
+          y = 0 - (8 * indicatorFadeProgress);
+          x = 64 - frameStartPos + 12 * i;
+          break;
+        case BOTTOM:
+          y = 56 + (8 * indicatorFadeProgress);
+          x = 64 - frameStartPos + 12 * i;
+          break;
+        case RIGHT:
+          x = 120 + (8 * indicatorFadeProgress);
+          y = 32 - frameStartPos + 12 * i;
+          break;
+        case LEFT:
+          x = 0 - (8 * indicatorFadeProgress);
+          y = 32 - frameStartPos + 12 * i;
+          break;
+      }
+
+      if (posOfHighlightFrame == i) {
+         image = this->activeSymbol;
+      } else {
+         image = this->inactiveSymbol;
+      }
+
+      this->display->drawFastImage(x, y, 8, 8, image);
+    }
+}
+
+void OLEDDisplayUi::drawOverlays() {
+ for (uint8_t i=0;i<this->overlayCount;i++){
+    (this->overlayFunctions[i])(this->display, &this->state);
+ }
+}
+
+uint8_t OLEDDisplayUi::getNextFrameNumber(){
+  if (this->nextFrameNumber != -1) return this->nextFrameNumber;
+  return (this->state.currentFrame + this->frameCount + this->state.frameTransitionDirection) % this->frameCount;
+}
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayUi.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayUi.h
new file mode 100644
index 0000000..77c46c7
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/OLEDDisplayUi.h
@@ -0,0 +1,293 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#ifndef OLEDDISPLAYUI_h
+#define OLEDDISPLAYUI_h
+
+#include <Arduino.h>
+#include "OLEDDisplay.h"
+
+//#define DEBUG_OLEDDISPLAYUI(...) Serial.printf( __VA_ARGS__ )
+
+#ifndef DEBUG_OLEDDISPLAYUI
+#define DEBUG_OLEDDISPLAYUI(...)
+#endif
+
+enum AnimationDirection {
+  SLIDE_UP,
+  SLIDE_DOWN,
+  SLIDE_LEFT,
+  SLIDE_RIGHT
+};
+
+enum IndicatorPosition {
+  TOP,
+  RIGHT,
+  BOTTOM,
+  LEFT
+};
+
+enum IndicatorDirection {
+  LEFT_RIGHT,
+  RIGHT_LEFT
+};
+
+enum FrameState {
+  IN_TRANSITION,
+  FIXED
+};
+
+
+const char ANIMATION_activeSymbol[] PROGMEM = {
+  0x00, 0x18, 0x3c, 0x7e, 0x7e, 0x3c, 0x18, 0x00
+};
+
+const char ANIMATION_inactiveSymbol[] PROGMEM = {
+  0x00, 0x0, 0x0, 0x18, 0x18, 0x0, 0x0, 0x00
+};
+
+
+// Structure of the UiState
+struct OLEDDisplayUiState {
+  u_int64_t     lastUpdate                = 0;
+  uint16_t      ticksSinceLastStateSwitch = 0;
+
+  FrameState    frameState                = FIXED;
+  uint8_t       currentFrame              = 0;
+
+  bool          isIndicatorDrawen         = true;
+
+  // Normal = 1, Inverse = -1;
+  int8_t         frameTransitionDirection  = 1;
+
+  bool          manuelControll            = false;
+
+  // Custom data that can be used by the user
+  void*         userData                  = NULL;
+};
+
+struct LoadingStage {
+  const char* process;
+  void (*callback)();
+};
+
+typedef void (*FrameCallback)(OLEDDisplay *display,  OLEDDisplayUiState* state, int16_t x, int16_t y);
+typedef void (*OverlayCallback)(OLEDDisplay *display,  OLEDDisplayUiState* state);
+typedef void (*LoadingDrawFunction)(OLEDDisplay *display, LoadingStage* stage, uint8_t progress);
+
+class OLEDDisplayUi {
+  private:
+    OLEDDisplay             *display;
+
+    // Symbols for the Indicator
+    IndicatorPosition   indicatorPosition         = BOTTOM;
+    IndicatorDirection  indicatorDirection        = LEFT_RIGHT;
+
+    const char*         activeSymbol              = ANIMATION_activeSymbol;
+    const char*         inactiveSymbol            = ANIMATION_inactiveSymbol;
+
+    // Values for the Frames
+    AnimationDirection  frameAnimationDirection   = SLIDE_RIGHT;
+
+    int8_t              lastTransitionDirection   = 1;
+
+    uint16_t            ticksPerFrame             = 151; // ~ 5000ms at 30 FPS
+    uint16_t            ticksPerTransition        = 15;  // ~  500ms at 30 FPS
+
+    bool                autoTransition            = true;
+
+    FrameCallback*      frameFunctions;
+    uint8_t             frameCount                = 0;
+
+    // Internally used to transition to a specific frame
+    int8_t              nextFrameNumber           = -1;
+
+    // Values for Overlays
+    OverlayCallback*    overlayFunctions;
+    uint8_t             overlayCount              = 0;
+
+    // Will the Indicator be drawen
+    // 3 Not drawn in both frames
+    // 2 Drawn this frame but not next
+    // 1 Not drown this frame but next
+    // 0 Not known yet
+    uint8_t                indicatorDrawState        = 1;
+
+    // Loading screen
+    LoadingDrawFunction loadingDrawFunction       = [](OLEDDisplay *display, LoadingStage* stage, uint8_t progress) {
+      display->setTextAlignment(TEXT_ALIGN_CENTER);
+      display->setFont(ArialMT_Plain_10);
+      display->drawString(64, 18, stage->process);
+      display->drawProgressBar(4, 32, 120, 8, progress);
+    };
+
+    // UI State
+    OLEDDisplayUiState      state;
+
+    // Bookeeping for update
+    uint8_t             updateInterval            = 33;
+
+    uint8_t             getNextFrameNumber();
+    void                drawIndicator();
+    void                drawFrame();
+    void                drawOverlays();
+    void                tick();
+    void                resetState();
+
+  public:
+
+    OLEDDisplayUi(OLEDDisplay *display);
+
+    /**
+     * Initialise the display
+     */
+    void init();
+
+    /**
+     * Configure the internal used target FPS
+     */
+    void setTargetFPS(uint8_t fps);
+
+    // Automatic Controll
+    /**
+     * Enable automatic transition to next frame after the some time can be configured with `setTimePerFrame` and `setTimePerTransition`.
+     */
+    void enableAutoTransition();
+
+    /**
+     * Disable automatic transition to next frame.
+     */
+    void disableAutoTransition();
+
+    /**
+     * Set the direction if the automatic transitioning
+     */
+    void setAutoTransitionForwards();
+    void setAutoTransitionBackwards();
+
+    /**
+     *  Set the approx. time a frame is displayed
+     */
+    void setTimePerFrame(uint16_t time);
+
+    /**
+     * Set the approx. time a transition will take
+     */
+    void setTimePerTransition(uint16_t time);
+
+    // Customize indicator position and style
+
+    /**
+     * Draw the indicator.
+     * This is the defaut state for all frames if
+     * the indicator was hidden on the previous frame
+     * it will be slided in.
+     */
+    void enableIndicator();
+
+    /**
+     * Don't draw the indicator.
+     * This will slide out the indicator
+     * when transitioning to the next frame.
+     */
+    void disableIndicator();
+
+    /**
+     * Set the position of the indicator bar.
+     */
+    void setIndicatorPosition(IndicatorPosition pos);
+
+    /**
+     * Set the direction of the indicator bar. Defining the order of frames ASCENDING / DESCENDING
+     */
+    void setIndicatorDirection(IndicatorDirection dir);
+
+    /**
+     * Set the symbol to indicate an active frame in the indicator bar.
+     */
+    void setActiveSymbol(const char* symbol);
+
+    /**
+     * Set the symbol to indicate an inactive frame in the indicator bar.
+     */
+    void setInactiveSymbol(const char* symbol);
+
+
+    // Frame settings
+
+    /**
+     * Configure what animation is used to transition from one frame to another
+     */
+    void setFrameAnimation(AnimationDirection dir);
+
+    /**
+     * Add frame drawing functions
+     */
+    void setFrames(FrameCallback* frameFunctions, uint8_t frameCount);
+
+    // Overlay
+
+    /**
+     * Add overlays drawing functions that are draw independent of the Frames
+     */
+    void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
+
+
+    // Loading animation
+    /**
+     * Set the function that will draw each step
+     * in the loading animation
+     */
+    void setLoadingDrawFunction(LoadingDrawFunction loadingFunction);
+
+
+    /**
+     * Run the loading process
+     */
+    void runLoadingProcess(LoadingStage* stages, uint8_t stagesCount);
+
+
+    // Manual Control
+    void nextFrame();
+    void previousFrame();
+
+    /**
+     * Switch without transition to frame `frame`.
+     */
+    void switchToFrame(uint8_t frame);
+
+    /**
+     * Transition to frame `frame`, when the `frame` number is bigger than the current
+     * frame the forward animation will be used, otherwise the backwards animation is used.
+     */
+    void transitionToFrame(uint8_t frame);
+
+    // State Info
+    OLEDDisplayUiState* getUiState();
+
+    int8_t update();
+};
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/README.md b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/README.md
new file mode 100644
index 0000000..6e60fc6
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/README.md
@@ -0,0 +1,377 @@
+esp8266-oled-ssd1306 [![Build Status](https://travis-ci.org/squix78/esp8266-oled-ssd1306.svg?branch=dev-branch-3.0.0)](https://travis-ci.org/squix78/esp8266-oled-ssd1306)
+============
+
+> We just released version 3.0.0. Please have a look at our [upgrade guide](UPGRADE-3.0.md)
+
+This is a driver for the SSD1306 based 128x64 pixel OLED display running on the Arduino/ESP8266 platform.
+Can be used with either the I2C or SPI version of the display
+
+You can either download this library as a zip file and unpack it to your Arduino/libraries folder or (once it has been added) choose it from the Arduino library manager.
+
+It is also available as a platformio library. Just execute the following command:
+```
+platformio lib install 562
+```
+
+## Credits
+This library has initially been written by Daniel Eichhorn (@squix78). Many thanks go to Fabrice Weinberg (@FWeinb) for optimizing and refactoring many aspects of the library. Also many thanks to the many committers who helped to add new features and who fixed many bugs.
+The init sequence for the SSD1306 was inspired by Adafruit's library for the same display.
+
+## Usage
+
+Check out the examples folder for a few comprehensive demonstrations how to use the library. Also check out the ESP8266 Weather Station library (https://github.com/squix78/esp8266-weather-station) which uses the OLED library to display beautiful weather information.
+
+## Upgrade
+
+The API changed a lot with the 3.0 release. If you were using this library with older versions please have a look at the [Upgrade Guide](UPGRADE-3.0.md).
+
+## Features
+
+* Draw pixels at given coordinates
+* Draw lines from given coordinates to given coordinates
+* Draw or fill a rectangle with given dimensions
+* Draw Text at given coordinates:
+ * Define Alignment: Left, Right and Center
+ * Set the Fontface you want to use (see section Fonts below)
+ * Limit the width of the text by an amount of pixels. Before this widths will be reached, the renderer will wrap the text to a new line if possible
+* Display content in automatically side scrolling carousel
+ * Define transition cycles
+ * Define how long one frame will be displayed
+ * Draw the different frames in callback methods
+ * One indicator per frame will be automatically displayed. The active frame will be displayed from inactive once
+
+## Fonts
+
+Fonts are defined in a proprietary but open format. You can create new font files by choosing from a given list
+of open sourced Fonts from this web app: http://oleddisplay.squix.ch
+Choose the font family, style and size, check the preview image and if you like what you see click the "Create" button. This will create the font array in a text area form where you can copy and paste it into a new or existing header file.
+
+
+![FontTool](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/FontTool.png)
+
+## Hardware Abstraction
+
+The library supports different protocols to access the OLED display. Currently there is support for I2C using the built in Wire.h library, I2C by using the much faster BRZO I2C library [https://github.com/pasko-zh/brzo_i2c] written in assembler and it also supports displays which come with the SPI interface.
+
+### I2C with Wire.h
+
+```C++
+#include <Wire.h>  
+#include "SSD1306.h"
+
+SSD1306  display(ADDRESS, SDA, SDC);
+```
+or for a SH1106:
+```C++
+#include <Wire.h>  
+#include "SH1106.h"
+
+SH1106  display(ADDRESS, SDA, SDC);
+```
+
+### I2C with brzo_i2c
+
+```C++
+#include <brzo_i2c.h>
+#include "SSD1306Brzo.h"
+
+SSD1306Brzo display(ADDRESS, SDA, SDC);
+```
+or for the SH1106:
+```C++
+#include <brzo_i2c.h>
+#include "SH1106Brzo.h"
+
+SH1106Brzo display(ADDRESS, SDA, SDC);
+```
+
+### SPI
+
+```C++
+#include <SPI.h>
+#include "SSD1306Spi.h"
+
+SSD1306Spi display(RES, DC, CS);
+```
+or for the SH1106:
+```C++
+#include <SPI.h>
+#include "SH1106Spi.h"
+
+SH1106Spi display(RES, DC, CS);
+```
+
+## API
+
+### Display Control
+
+```C++
+// Initialize the display
+void init();
+
+// Free the memory used by the display
+void end();
+
+// Cycle through the initialization
+void resetDisplay(void);
+
+// Connect again to the display through I2C
+void reconnect(void);
+
+// Turn the display on
+void displayOn(void);
+
+// Turn the display offs
+void displayOff(void);
+
+// Clear the local pixel buffer
+void clear(void);
+
+// Write the buffer to the display memory
+void display(void);
+
+// Inverted display mode
+void invertDisplay(void);
+
+// Normal display mode
+void normalDisplay(void);
+
+// Set display contrast
+void setContrast(char contrast);
+
+// Turn the display upside down
+void flipScreenVertically();
+```
+
+## Pixel drawing
+
+```C++
+
+/* Drawing functions */
+// Sets the color of all pixel operations
+void setColor(OLEDDISPLAY_COLOR color);
+
+// Draw a pixel at given position
+void setPixel(int16_t x, int16_t y);
+
+// Draw a line from position 0 to position 1
+void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1);
+
+// Draw the border of a rectangle at the given location
+void drawRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+// Fill the rectangle
+void fillRect(int16_t x, int16_t y, int16_t width, int16_t height);
+
+// Draw the border of a circle
+void drawCircle(int16_t x, int16_t y, int16_t radius);
+
+// Fill circle
+void fillCircle(int16_t x, int16_t y, int16_t radius);
+
+// Draw a line horizontally
+void drawHorizontalLine(int16_t x, int16_t y, int16_t length);
+
+// Draw a lin vertically
+void drawVerticalLine(int16_t x, int16_t y, int16_t length);
+
+// Draws a rounded progress bar with the outer dimensions given by width and height. Progress is
+// a unsigned byte value between 0 and 100
+void drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress);
+
+// Draw a bitmap in the internal image format
+void drawFastImage(int16_t x, int16_t y, int16_t width, int16_t height, const char *image);
+
+// Draw a XBM
+void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, const char* xbm);
+```
+
+## Text operations
+
+``` C++
+void drawString(int16_t x, int16_t y, String text);
+
+// Draws a String with a maximum width at the given location.
+// If the given String is wider than the specified width
+// The text will be wrapped to the next line at a space or dash
+void drawStringMaxWidth(int16_t x, int16_t y, int16_t maxLineWidth, String text);
+
+// Returns the width of the const char* with the current
+// font settings
+uint16_t getStringWidth(const char* text, uint16_t length);
+
+// Convencience method for the const char version
+uint16_t getStringWidth(String text);
+
+// Specifies relative to which anchor point
+// the text is rendered. Available constants:
+// TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER_BOTH
+void setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment);
+
+// Sets the current font. Available default fonts
+// ArialMT_Plain_10, ArialMT_Plain_16, ArialMT_Plain_24
+// Or create one with the font tool at http://oleddisplay.squix.ch
+void setFont(const char* fontData);
+```
+
+## Ui Library (OLEDDisplayUi)
+
+The Ui Library is used to provide a basic set of Ui elements called, `Frames` and `Overlays`. A `Frame` is used to provide
+information the default behaviour is to display a `Frame` for a defined time and than move to the next. The library also provides an `Indicator` that will be updated accordingly. An `Overlay` on the other hand is a pieces of information (e.g. a clock) that is displayed always at the same position.
+
+
+```C++
+/**
+ * Initialise the display
+ */
+void init();
+
+/**
+ * Configure the internal used target FPS
+ */
+void setTargetFPS(uint8_t fps);
+
+/**
+ * Enable automatic transition to next frame after the some time can be configured with
+ * `setTimePerFrame` and `setTimePerTransition`.
+ */
+void enableAutoTransition();
+
+/**
+ * Disable automatic transition to next frame.
+ */
+void disableAutoTransition();
+
+/**
+ * Set the direction if the automatic transitioning
+ */
+void setAutoTransitionForwards();
+void setAutoTransitionBackwards();
+
+/**
+ *  Set the approx. time a frame is displayed
+ */
+void setTimePerFrame(uint16_t time);
+
+/**
+ * Set the approx. time a transition will take
+ */
+void setTimePerTransition(uint16_t time);
+
+/**
+ * Draw the indicator.
+ * This is the default state for all frames if
+ * the indicator was hidden on the previous frame
+ * it will be slided in.
+ */
+void enableIndicator();
+
+/**
+ * Don't draw the indicator.
+ * This will slide out the indicator
+ * when transitioning to the next frame.
+ */
+void disableIndicator();
+
+/**
+ * Set the position of the indicator bar.
+ */
+void setIndicatorPosition(IndicatorPosition pos);
+
+/**
+ * Set the direction of the indicator bar. Defining the order of frames ASCENDING / DESCENDING
+ */
+void setIndicatorDirection(IndicatorDirection dir);
+
+/**
+ * Set the symbol to indicate an active frame in the indicator bar.
+ */
+void setActiveSymbol(const char* symbol);
+
+/**
+ * Set the symbol to indicate an inactive frame in the indicator bar.
+ */
+void setInactiveSymbol(const char* symbol);
+
+/**
+ * Configure what animation is used to transition from one frame to another
+ */
+void setFrameAnimation(AnimationDirection dir);
+
+/**
+ * Add frame drawing functions
+ */
+void setFrames(FrameCallback* frameFunctions, uint8_t frameCount);
+
+/**
+ * Add overlays drawing functions that are draw independent of the Frames
+ */
+void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
+
+/**
+ * Set the function that will draw each step
+ * in the loading animation
+ */
+void setLoadingDrawFunction(LoadingDrawFunction stage);
+
+/**
+ * Run the loading process
+ */
+void runLoadingProcess(LoadingStage* stages, uint8_t stagesCount);
+
+// Manuell Controll
+void nextFrame();
+void previousFrame();
+
+/**
+ * Switch without transition to frame `frame`.
+ */
+void switchToFrame(uint8_t frame);
+
+/**
+ * Transition to frame `frame`, when the `frame` number is bigger than the current
+ * frame the forward animation will be used, otherwise the backwards animation is used.
+ */
+void transitionToFrame(uint8_t frame);
+
+// State Info
+OLEDDisplayUiState* getUiState();
+
+// This needs to be called in the main loop
+// the returned value is the remaining time (in ms)
+// you have to draw after drawing to keep the frame budget.
+int8_t update();
+```
+
+## Example: SSD1306Demo
+
+### Frame 1
+![DemoFrame1](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame1.jpg)
+
+This frame shows three things:
+ * How to draw an xbm image
+ * How to draw a static text which is not moved by the frame transition
+ * The active/inactive frame indicators
+
+### Frame 2
+![DemoFrame2](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame2.jpg)
+
+Currently there are one fontface with three sizes included in the library: Arial 10, 16 and 24. Once the converter is published you will be able to convert any ttf font into the used format.
+
+### Frame 3
+
+![DemoFrame3](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame3.jpg)
+
+This frame demonstrates the text alignment. The coordinates in the frame show relative to which position the texts have been rendered.
+
+### Frame 4
+
+![DemoFrame4](https://github.com/squix78/esp8266-oled-ssd1306/raw/master/resources/DemoFrame4.jpg)
+
+This shows how to use define a maximum width after which the driver automatically wraps a word to the next line. This comes in very handy if you have longer texts to display.
+
+### SPI version
+
+![SPIVersion](https://github.com/neptune2/esp8266-oled-ssd1306/raw/master/resources/SPI_version.jpg)
+
+This shows the code working on the SPI version of the display. See demo code for ESP8266 pins used.
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106.h
new file mode 100644
index 0000000..55dd409
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106.h
@@ -0,0 +1,36 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef SH1106_h
+#define SH1106_h
+#include "SH1106Wire.h"
+
+// For make SH1106 an alias for SH1106Wire
+typedef SH1106Wire SH1106;
+
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106Brzo.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106Brzo.h
new file mode 100644
index 0000000..c1a89c4
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106Brzo.h
@@ -0,0 +1,117 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef SH1106Brzo_h
+#define SH1106Brzo_h
+
+#include "OLEDDisplay.h"
+#include <brzo_i2c.h>
+
+#if F_CPU == 160000000L
+  #define BRZO_I2C_SPEED 1000
+#else
+  #define BRZO_I2C_SPEED 800
+#endif
+
+class SH1106Brzo : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+      uint8_t             _sda;
+      uint8_t             _scl;
+
+  public:
+    SH1106Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl) {
+      this->_address = _address;
+      this->_sda = _sda;
+      this->_scl = _scl;
+    }
+
+    bool connect(){
+      brzo_i2c_setup(_sda, _scl, 0);
+      return true;
+    }
+
+    void display(void) {
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+       uint8_t minBoundY = ~0;
+       uint8_t maxBoundY = 0;
+
+       uint8_t x, y;
+
+       // Calculate the Y bounding box of changes
+       // and copy buffer[pos] to buffer_back[pos];
+       for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
+         for (x = 0; x < DISPLAY_WIDTH; x++) {
+          uint16_t pos = x + y * DISPLAY_WIDTH;
+          if (buffer[pos] != buffer_back[pos]) {
+            minBoundY = _min(minBoundY, y);
+            maxBoundY = _max(maxBoundY, y);
+          }
+          buffer_back[pos] = buffer[pos];
+        }
+        yield();
+       }
+
+       // If the minBoundY wasn't updated
+       // we can savely assume that buffer_back[pos] == buffer[pos]
+       // holdes true for all values of pos
+       if (minBoundY == ~0) return;
+
+       byte k = 0;
+       uint8_t sendBuffer[17];
+       sendBuffer[0] = 0x40;
+       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
+       for (y = minBoundY; y <= maxBoundY; y++) {
+         sendCommand(0xB0 + y);
+         sendCommand(0x02);
+         sendCommand(0x10);
+         for (x = 0; x < DISPLAY_WIDTH; x++) {
+             k++;
+             sendBuffer[k] = buffer[x + y * DISPLAY_WIDTH];
+             if (k == 16)  {
+               brzo_i2c_write(sendBuffer, 17, true);
+               k = 0;
+             }
+         }
+         yield();
+       }
+       brzo_i2c_write(sendBuffer, k + 1, true);
+       brzo_i2c_end_transaction();
+     #else
+     #endif
+    }
+
+  private:
+    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
+      uint8_t command[2] = {0x80 /* command mode */, com};
+      brzo_i2c_start_transaction(_address, BRZO_I2C_SPEED);
+      brzo_i2c_write(command, 2, true);
+      brzo_i2c_end_transaction();
+    }
+};
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106Wire.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106Wire.h
new file mode 100644
index 0000000..46a34f1
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SH1106Wire.h
@@ -0,0 +1,138 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef SH1106Wire_h
+#define SH1106Wire_h
+
+#include "OLEDDisplay.h"
+#include <Wire.h>
+
+#define SH1106_SET_PUMP_VOLTAGE 0X30
+#define SH1106_SET_PUMP_MODE 0XAD
+#define SH1106_PUMP_ON 0X8B
+#define SH1106_PUMP_OFF 0X8A
+//--------------------------------------
+
+class SH1106Wire : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+      uint8_t             _sda;
+      uint8_t             _scl;
+
+  public:
+    SH1106Wire(uint8_t _address, uint8_t _sda, uint8_t _scl) {
+      this->_address = _address;
+      this->_sda = _sda;
+      this->_scl = _scl;
+    }
+
+/*     bool connect() {
+      Wire.begin(this->_sda, this->_scl);
+      // Let's use ~700khz if ESP8266 is in 160Mhz mode
+      // this will be limited to ~400khz if the ESP8266 in 80Mhz mode.
+      Wire.setClock(700000);
+      return true;
+    } */
+
+    void display(void) {
+      #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+        uint8_t minBoundY = ~0;
+        uint8_t maxBoundY = 0;
+        uint8_t x, y;
+
+        // Calculate the Y bounding box of changes
+        // and copy buffer[pos] to buffer_back[pos];
+        for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
+          for (x = 0; x < DISPLAY_WIDTH; x++) {
+           uint16_t pos = x + y * DISPLAY_WIDTH;
+           if (buffer[pos] != buffer_back[pos]) {
+             minBoundY = _min(minBoundY, y);
+             maxBoundY = _max(maxBoundY, y);
+           }
+           buffer_back[pos] = buffer[pos];
+         }
+         yield();
+        }
+
+        // If the minBoundY wasn't updated
+        // we can savely assume that buffer_back[pos] == buffer[pos]
+        // holdes true for all values of pos
+        if (minBoundY == ~0) return;
+
+        byte k = 0;
+        for (y = minBoundY; y <= maxBoundY; y++) {
+          sendCommand(0xB0 + y);
+          sendCommand(0x02);
+          sendCommand(0x10);
+          for (x = 0; x < DISPLAY_WIDTH; x++) {
+            if (k == 0) {
+              Wire.beginTransmission(_address);
+              Wire.write(0x40);
+            }
+            Wire.write(buffer[x + y * DISPLAY_WIDTH]);
+            k++;
+            if (k == 16)  {
+              Wire.endTransmission();
+              k = 0;
+            }
+          }
+          yield();
+        }
+
+        if (k != 0) {
+          Wire.endTransmission();
+        }
+      #else
+        uint8_t * p = &buffer[0];
+        for (uint8_t y=0; y<8; y++) {
+          sendCommand(0xB0+y);
+          sendCommand(0x02);
+          sendCommand(0x10);
+          for( uint8_t x=0; x<8; x++) {
+            Wire.beginTransmission(_address);
+            Wire.write(0x40);
+            for (uint8_t k = 0; k < 16; k++) {
+              Wire.write(*p++);
+            }
+            Wire.endTransmission();
+          }
+        }
+      #endif
+    }
+
+  private:
+    inline void sendCommand(uint8_t command) __attribute__((always_inline)){
+      Wire.beginTransmission(_address);
+      Wire.write(0x80);
+      Wire.write(command);
+      Wire.endTransmission();
+    }
+
+
+};
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306.h
new file mode 100644
index 0000000..f3b7909
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306.h
@@ -0,0 +1,36 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef SSD1306_h
+#define SSD1306_h
+#include "SSD1306Wire.h"
+
+// For legacy support make SSD1306 an alias for SSD1306
+typedef SSD1306Wire SSD1306;
+
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Brzo.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Brzo.h
new file mode 100644
index 0000000..3b99d82
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Brzo.h
@@ -0,0 +1,149 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef SSD1306Brzo_h
+#define SSD1306Brzo_h
+
+#include "OLEDDisplay.h"
+#include <brzo_i2c.h>
+
+#if F_CPU == 160000000L
+  #define BRZO_I2C_SPEED 1000
+#else
+  #define BRZO_I2C_SPEED 800
+#endif
+
+class SSD1306Brzo : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+      uint8_t             _sda;
+      uint8_t             _scl;
+
+  public:
+    SSD1306Brzo(uint8_t _address, uint8_t _sda, uint8_t _scl) {
+      this->_address = _address;
+      this->_sda = _sda;
+      this->_scl = _scl;
+    }
+
+    bool connect(){
+      brzo_i2c_setup(_sda, _scl, 0);
+      return true;
+    }
+
+    void display(void) {
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+       uint8_t minBoundY = ~0;
+       uint8_t maxBoundY = 0;
+
+       uint8_t minBoundX = ~0;
+       uint8_t maxBoundX = 0;
+
+       uint8_t x, y;
+
+       // Calculate the Y bounding box of changes
+       // and copy buffer[pos] to buffer_back[pos];
+       for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
+         for (x = 0; x < DISPLAY_WIDTH; x++) {
+          uint16_t pos = x + y * DISPLAY_WIDTH;
+          if (buffer[pos] != buffer_back[pos]) {
+            minBoundY = _min(minBoundY, y);
+            maxBoundY = _max(maxBoundY, y);
+            minBoundX = _min(minBoundX, x);
+            maxBoundX = _max(maxBoundX, x);
+          }
+          buffer_back[pos] = buffer[pos];
+        }
+        yield();
+       }
+
+       // If the minBoundY wasn't updated
+       // we can savely assume that buffer_back[pos] == buffer[pos]
+       // holdes true for all values of pos
+       if (minBoundY == ~0) return;
+
+       sendCommand(COLUMNADDR);
+       sendCommand(minBoundX);
+       sendCommand(maxBoundX);
+
+       sendCommand(PAGEADDR);
+       sendCommand(minBoundY);
+       sendCommand(maxBoundY);
+
+       byte k = 0;
+       uint8_t sendBuffer[17];
+       sendBuffer[0] = 0x40;
+       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
+       for (y = minBoundY; y <= maxBoundY; y++) {
+           for (x = minBoundX; x <= maxBoundX; x++) {
+               k++;
+               sendBuffer[k] = buffer[x + y * DISPLAY_WIDTH];
+               if (k == 16)  {
+                 brzo_i2c_write(sendBuffer, 17, true);
+                 k = 0;
+               }
+           }
+           yield();
+       }
+       brzo_i2c_write(sendBuffer, k + 1, true);
+       brzo_i2c_end_transaction();
+     #else
+       // No double buffering
+       sendCommand(COLUMNADDR);
+       sendCommand(0x0);
+       sendCommand(0x7F);
+
+       sendCommand(PAGEADDR);
+       sendCommand(0x0);
+       sendCommand(0x7);
+
+       uint8_t sendBuffer[17];
+       sendBuffer[0] = 0x40;
+       brzo_i2c_start_transaction(this->_address, BRZO_I2C_SPEED);
+       for (uint16_t i=0; i<DISPLAY_BUFFER_SIZE; i++) {
+         for (uint8_t x=1; x<17; x++) {
+           sendBuffer[x] = buffer[i];
+           i++;
+         }
+         i--;
+         brzo_i2c_write(sendBuffer,  17,  true);
+         yield();
+       }
+       brzo_i2c_end_transaction();
+     #endif
+    }
+
+  private:
+    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
+      uint8_t command[2] = {0x80 /* command mode */, com};
+      brzo_i2c_start_transaction(_address, BRZO_I2C_SPEED);
+      brzo_i2c_write(command, 2, true);
+      brzo_i2c_end_transaction();
+    }
+};
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Spi.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Spi.h
new file mode 100644
index 0000000..2179458
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Spi.h
@@ -0,0 +1,150 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef SSD1306Spi_h
+#define SSD1306Spi_h
+
+#include "OLEDDisplay.h"
+#include <SPI.h>
+
+#if F_CPU == 160000000L
+  #define BRZO_I2C_SPEED 1000
+#else
+  #define BRZO_I2C_SPEED 800
+#endif
+
+class SSD1306Spi : public OLEDDisplay {
+  private:
+      uint8_t             _rst;
+      uint8_t             _dc;
+      uint8_t             _cs;
+
+  public:
+    SSD1306Spi(uint8_t _rst, uint8_t _dc, uint8_t _cs) {
+      this->_rst = _rst;
+      this->_dc  = _dc;
+      this->_cs  = _cs;
+    }
+
+    bool connect(){
+      pinMode(_dc, OUTPUT);
+      pinMode(_cs, OUTPUT);
+      pinMode(_rst, OUTPUT);
+
+      SPI.begin ();
+      SPI.setClockDivider (SPI_CLOCK_DIV2);
+
+      // Pulse Reset low for 10ms
+      digitalWrite(_rst, HIGH);
+      delay(1);
+      digitalWrite(_rst, LOW);
+      delay(10);
+      digitalWrite(_rst, HIGH);
+      return true;
+    }
+
+    void display(void) {
+    #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+       uint8_t minBoundY = ~0;
+       uint8_t maxBoundY = 0;
+
+       uint8_t minBoundX = ~0;
+       uint8_t maxBoundX = 0;
+
+       uint8_t x, y;
+
+       // Calculate the Y bounding box of changes
+       // and copy buffer[pos] to buffer_back[pos];
+       for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
+         for (x = 0; x < DISPLAY_WIDTH; x++) {
+          uint16_t pos = x + y * DISPLAY_WIDTH;
+          if (buffer[pos] != buffer_back[pos]) {
+            minBoundY = _min(minBoundY, y);
+            maxBoundY = _max(maxBoundY, y);
+            minBoundX = _min(minBoundX, x);
+            maxBoundX = _max(maxBoundX, x);
+          }
+          buffer_back[pos] = buffer[pos];
+        }
+        yield();
+       }
+
+       // If the minBoundY wasn't updated
+       // we can savely assume that buffer_back[pos] == buffer[pos]
+       // holdes true for all values of pos
+       if (minBoundY == ~0) return;
+
+       sendCommand(COLUMNADDR);
+       sendCommand(minBoundX);
+       sendCommand(maxBoundX);
+
+       sendCommand(PAGEADDR);
+       sendCommand(minBoundY);
+       sendCommand(maxBoundY);
+
+       digitalWrite(_cs, HIGH);
+       digitalWrite(_dc, HIGH);   // data mode
+       digitalWrite(_cs, LOW);
+       for (y = minBoundY; y <= maxBoundY; y++) {
+         for (x = minBoundX; x <= maxBoundX; x++) {
+           SPI.transfer(buffer[x + y * DISPLAY_WIDTH]);
+         }
+         yield();
+       }
+       digitalWrite(_cs, HIGH);
+     #else
+       // No double buffering
+       sendCommand(COLUMNADDR);
+       sendCommand(0x0);
+       sendCommand(0x7F);
+
+       sendCommand(PAGEADDR);
+       sendCommand(0x0);
+       sendCommand(0x7);
+
+        digitalWrite(_cs, HIGH);
+        digitalWrite(_dc, HIGH);   // data mode
+        digitalWrite(_cs, LOW);
+        for (uint16_t i=0; i<DISPLAY_BUFFER_SIZE; i++) {
+          SPI.transfer(buffer[i]);
+          yield();
+        }
+        digitalWrite(_cs, HIGH);
+     #endif
+    }
+
+  private:
+    inline void sendCommand(uint8_t com) __attribute__((always_inline)){
+      digitalWrite(_cs, HIGH);
+      digitalWrite(_dc, LOW);
+      digitalWrite(_cs, LOW);
+      SPI.transfer(com);
+      digitalWrite(_cs, HIGH);
+    }
+};
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Wire.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Wire.h
new file mode 100644
index 0000000..773cac3
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/SSD1306Wire.h
@@ -0,0 +1,139 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Credits for parts of this code go to Mike Rankin. Thank you so much for sharing!
+ */
+
+#ifndef SSD1306Wire_h
+#define SSD1306Wire_h
+
+#include "OLEDDisplay.h"
+#include <Wire.h>
+
+class SSD1306Wire : public OLEDDisplay {
+  private:
+      uint8_t             _address;
+
+
+  public:
+    SSD1306Wire(uint8_t _address) {
+      this->_address = _address;
+
+    }
+
+
+
+    void display(void) {
+      #ifdef OLEDDISPLAY_DOUBLE_BUFFER
+        uint8_t minBoundY = ~0;
+        uint8_t maxBoundY = 0;
+
+        uint8_t minBoundX = ~0;
+        uint8_t maxBoundX = 0;
+        uint8_t x, y;
+
+        // Calculate the Y bounding box of changes
+        // and copy buffer[pos] to buffer_back[pos];
+        for (y = 0; y < (DISPLAY_HEIGHT / 8); y++) {
+          for (x = 0; x < DISPLAY_WIDTH; x++) {
+           uint16_t pos = x + y * DISPLAY_WIDTH;
+           if (buffer[pos] != buffer_back[pos]) {
+             minBoundY = _min(minBoundY, y);
+             maxBoundY = _max(maxBoundY, y);
+             minBoundX = _min(minBoundX, x);
+             maxBoundX = _max(maxBoundX, x);
+           }
+           buffer_back[pos] = buffer[pos];
+         }
+         yield();
+        }
+
+        // If the minBoundY wasn't updated
+        // we can savely assume that buffer_back[pos] == buffer[pos]
+        // holdes true for all values of pos
+        if (minBoundY == ~0) return;
+
+        sendCommand(COLUMNADDR);
+        sendCommand(minBoundX);
+        sendCommand(maxBoundX);
+
+        sendCommand(PAGEADDR);
+        sendCommand(minBoundY);
+        sendCommand(maxBoundY);
+
+        byte k = 0;
+        for (y = minBoundY; y <= maxBoundY; y++) {
+          for (x = minBoundX; x <= maxBoundX; x++) {
+            if (k == 0) {
+              Wire.beginTransmission(_address);
+              Wire.write(0x40);
+            }
+            Wire.write(buffer[x + y * DISPLAY_WIDTH]);
+            k++;
+            if (k == 16)  {
+              Wire.endTransmission();
+              k = 0;
+            }
+          }
+          yield();
+        }
+
+        if (k != 0) {
+          Wire.endTransmission();
+        }
+      #else
+
+        sendCommand(COLUMNADDR);
+        sendCommand(0x0);
+        sendCommand(0x7F);
+
+        sendCommand(PAGEADDR);
+        sendCommand(0x0);
+        sendCommand(0x7);
+
+        for (uint16_t i=0; i < DISPLAY_BUFFER_SIZE; i++) {
+          Wire.beginTransmission(this->_address);
+          Wire.write(0x40);
+          for (uint8_t x = 0; x < 16; x++) {
+            Wire.write(buffer[i]);
+            i++;
+          }
+          i--;
+          Wire.endTransmission();
+        }
+      #endif
+    }
+
+  private:
+    inline void sendCommand(uint8_t command) __attribute__((always_inline)){
+      Wire.beginTransmission(_address);
+      Wire.write(0x80);
+      Wire.write(command);
+      Wire.endTransmission();
+    }
+
+
+};
+
+#endif
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/UPGRADE-3.0.md b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/UPGRADE-3.0.md
new file mode 100644
index 0000000..e7a315b
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/UPGRADE-3.0.md
@@ -0,0 +1,125 @@
+# Upgrade from 2.0 to 3.0
+
+While developing version 3.0 we made some breaking changes to the public
+API of this library. This document will help you update your code to work with
+version 3.0
+
+## Font Definitions
+
+To get better performance and a smaller font definition format, we change the memory
+layout of the font definition format. If you are using custom fonts not included in
+this library we updated the font generator [here](http://oleddisplay.squix.ch/#/home).
+Please update your fonts to be working with 3.0 by selecting the respective version in the dropdown.
+
+
+## Architectural Changes
+
+To become a more versatile library for the SSD1306 chipset we abstracted the
+hardware connection into subclasses of the base display class now called `OLEDDisplay`.
+This library is currently shipping with three implementations:
+
+  * `SSD1306Wire` implementing the I2C protocol using the Wire Library.    
+  * `SSD1306Brzo` implementing the I2C protocol using the faster [`brzo_i2c`](https://github.com/pasko-zh/brzo_i2c) library.
+  * `SSD1306Spi` implementing the SPI protocol.
+
+To keep backwards compatiblity with the old API `SSD1306` is an alias of `SSD1306Wire`.
+If you are not using the UI components you don't have to change anything to keep your code working.
+
+## Name Changes
+
+[Naming things is hard](http://martinfowler.com/bliki/TwoHardThings.html), to better reflect our intention with this library
+we changed the name of the base class to `OLEDDisplay` and the UI library accordingly to `OLEDDisplayUi`.
+As a consequence the type definitions of all frame and overlay related functions changed.
+This means that you have to update all your frame drawing callbacks from:
+
+```c
+bool frame1(SSD1306 *display,  SSD1306UiState* state, int x, int y);
+```
+
+too
+
+```c
+void frame1(OLEDDisplay *display,  OLEDDisplayUiState* state, int16_t x, int16_t y);
+```
+
+And your overlay drawing functions from:
+
+```c
+bool overlay1(SSD1306 *display,  SSD1306UiState* state);
+```
+
+too
+
+```c
+void overlay1(OLEDDisplay *display,  OLEDDisplayUiState* state);
+```
+
+## New Features
+
+### Loading Animation
+
+While using this library ourself we noticed a pattern emerging. We want to drawing
+a loading progress while connecting to WiFi and updating weather data etc.
+
+The simplest thing was to add the function `drawProgressBar(x, y, width,  height, progress)`
+,where `progress` is between `0` and `100`, right to the `OLEDDisplay` class.
+
+But we didn't stop there. We added a new feature to the `OLEDDisplayUi` called `LoadingStages`.
+You can define your loading process like this:
+
+```c++
+LoadingStage loadingStages[] = {
+  {
+    .process = "Connect to WiFi",
+    .callback = []() {
+      // Connect to WiFi
+    }
+  },
+  {
+    .process = "Get time from NTP",
+    .callback = []() {
+      // Get current time via NTP
+    }
+  }
+  // more steps
+};
+
+int LOADING_STAGES_COUNT = sizeof(loadingStages) / sizeof(LoadingStage);
+```
+
+After defining your array of `LoadingStages` you can then run the loading process by using
+`ui.runLoadingProcess(loadingStages, LOADING_STAGES_COUNT)`. This will give you a
+nice little loading animation you can see in the beginning of [this](https://vimeo.com/168362918)
+video.
+
+To further customize this you are free to define your own `LoadingDrawFunction` like this:
+
+```c
+void myLoadingDraw(OLEDDisplay *display, LoadingStage* stage, uint8_t progress) {
+  display->setTextAlignment(TEXT_ALIGN_CENTER);
+  display->setFont(ArialMT_Plain_10);
+  // stage->process contains the text of the current progress e.q. "Connect to WiFi"
+  display->drawString(64, 18, stage->process);
+  // you could just print the current process without the progress bar
+  display->drawString(64, 28, progress);
+}
+```
+
+After defining a function like that, you can pass it to the Ui library by use
+`ui.setLoadingDrawFunction(myLoadingDraw)`.
+
+
+### Text Logging
+
+It is always useful to display some text on the display without worrying to much
+where it goes and managing it. In 3.0 we made the `OLEDDisplay` class implement
+[`Print`](https://github.com/arduino/Arduino/blob/master/hardware/arduino/avr/cores/arduino/Print.h)
+so you can use it like you would use `Serial`. We calls this feature `LogBuffer`
+and the only thing you have to do is to define how many lines you want to display
+and how many characters there are on average on each. This is done by calling
+`setLogBuffer(lines, chars);`. If there is not enough memory the function will
+return false.
+
+After that you can draw the `LogBuffer` anywhere you want by calling `drawLogBuffer(x, y)`.
+(Note: You have to call `display()` to update the screen)
+We made a [video](https://www.youtube.com/watch?v=8Fiss77A3TE) showing this feature in action.
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
new file mode 100644
index 0000000..d9b5c1a
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306ClockDemo/SSD1306ClockDemo.ino
@@ -0,0 +1,204 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <Wire.h>
+#include <TimeLib.h>
+
+// Include the correct display library
+// For a connection via I2C using Wire include
+#include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
+// For a connection via I2C using brzo_i2c (must be installed) include
+// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Brzo.h"
+// For a connection via SPI include
+// #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Spi.h"
+
+// Include the UI lib
+#include "OLEDDisplayUi.h"
+
+// Include custom images
+#include "images.h"
+
+// Use the corresponding display class:
+
+// Initialize the OLED display using SPI
+// D5 -> CLK
+// D7 -> MOSI (DOUT)
+// D0 -> RES
+// D2 -> DC
+// D8 -> CS
+// SSD1306Spi        display(D0, D2, D8);
+
+// Initialize the OLED display using brzo_i2c
+// D3 -> SDA
+// D4 -> SCL
+// SSD1306Brzo display(0x3c, D3, D5);
+
+// Initialize the OLED display using Wire library
+SSD1306  display(0x3c, D3, D5);
+
+OLEDDisplayUi ui ( &display );
+
+int screenW = 128;
+int screenH = 64;
+int clockCenterX = screenW/2;
+int clockCenterY = ((screenH-16)/2)+16;   // top yellow part is 16 px height
+int clockRadius = 23;
+
+// utility function for digital clock display: prints leading 0
+String twoDigits(int digits){
+  if(digits < 10) {
+    String i = '0'+String(digits);
+    return i;
+  }
+  else {
+    return String(digits);
+  }
+}
+
+void clockOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
+
+}
+
+void analogClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+//  ui.disableIndicator();
+
+  // Draw the clock face
+//  display->drawCircle(clockCenterX + x, clockCenterY + y, clockRadius);
+  display->drawCircle(clockCenterX + x, clockCenterY + y, 2);
+  //
+  //hour ticks
+  for( int z=0; z < 360;z= z + 30 ){
+  //Begin at 0° and stop at 360°
+    float angle = z ;
+    angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+    int x2 = ( clockCenterX + ( sin(angle) * clockRadius ) );
+    int y2 = ( clockCenterY - ( cos(angle) * clockRadius ) );
+    int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
+    int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
+    display->drawLine( x2 + x , y2 + y , x3 + x , y3 + y);
+  }
+
+  // display second hand
+  float angle = second() * 6 ;
+  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+  int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
+  int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
+  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
+  //
+  // display minute hand
+  angle = minute() * 6 ;
+  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+  x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
+  y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
+  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
+  //
+  // display hour hand
+  angle = hour() * 30 + int( ( minute() / 12 ) * 6 )   ;
+  angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
+  x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
+  y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
+  display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
+}
+
+void digitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  String timenow = String(hour())+":"+twoDigits(minute())+":"+twoDigits(second());
+  display->setTextAlignment(TEXT_ALIGN_CENTER);
+  display->setFont(ArialMT_Plain_24);
+  display->drawString(clockCenterX + x , clockCenterY + y, timenow );
+}
+
+// This array keeps function pointers to all frames
+// frames are the single views that slide in
+FrameCallback frames[] = { analogClockFrame, digitalClockFrame };
+
+// how many frames are there?
+int frameCount = 2;
+
+// Overlays are statically drawn on top of a frame eg. a clock
+OverlayCallback overlays[] = { clockOverlay };
+int overlaysCount = 1;
+
+void setup() {
+  Serial.begin(9600);
+  Serial.println();
+
+	// The ESP is capable of rendering 60fps in 80Mhz mode
+	// but that won't give you much time for anything else
+	// run it in 160Mhz mode or just set it to 30 fps
+  ui.setTargetFPS(60);
+
+	// Customize the active and inactive symbol
+  ui.setActiveSymbol(activeSymbol);
+  ui.setInactiveSymbol(inactiveSymbol);
+
+  // You can change this to
+  // TOP, LEFT, BOTTOM, RIGHT
+  ui.setIndicatorPosition(TOP);
+
+  // Defines where the first frame is located in the bar.
+  ui.setIndicatorDirection(LEFT_RIGHT);
+
+  // You can change the transition that is used
+  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
+  ui.setFrameAnimation(SLIDE_LEFT);
+
+  // Add frames
+  ui.setFrames(frames, frameCount);
+
+  // Add overlays
+  ui.setOverlays(overlays, overlaysCount);
+
+  // Initialising the UI will init the display too.
+  ui.init();
+
+  display.flipScreenVertically();
+
+  unsigned long secsSinceStart = millis();
+  // Unix time starts on Jan 1 1970. In seconds, that's 2208988800:
+  const unsigned long seventyYears = 2208988800UL;
+  // subtract seventy years:
+  unsigned long epoch = secsSinceStart - seventyYears * SECS_PER_HOUR;
+  setTime(epoch);
+
+}
+
+
+void loop() {
+  int remainingTimeBudget = ui.update();
+
+  if (remainingTimeBudget > 0) {
+    // You can do some work here
+    // Don't do stuff if you are below your
+    // time budget.
+    delay(remainingTimeBudget);
+
+  }
+
+
+}
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306ClockDemo/images.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306ClockDemo/images.h
new file mode 100644
index 0000000..a220a27
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306ClockDemo/images.h
@@ -0,0 +1,21 @@
+const char activeSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00011000,
+    B00100100,
+    B01000010,
+    B01000010,
+    B00100100,
+    B00011000
+};
+
+const char inactiveSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00000000,
+    B00000000,
+    B00011000,
+    B00011000,
+    B00000000,
+    B00000000
+};
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
new file mode 100644
index 0000000..7e44ef6
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306SimpleDemo/SSD1306SimpleDemo.ino
@@ -0,0 +1,184 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <Wire.h>
+
+// Include the correct display library
+// For a connection via I2C using Wire include
+#include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
+// For a connection via I2C using brzo_i2c (must be installed) include
+// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Brzo.h"
+// For a connection via SPI include
+// #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Spi.h"
+
+// Include custom images
+#include "images.h"
+
+// Use the corresponding display class:
+
+// Initialize the OLED display using SPI
+// D5 -> CLK
+// D7 -> MOSI (DOUT)
+// D0 -> RES
+// D2 -> DC
+// D8 -> CS
+// SSD1306Spi        display(D0, D2, D8);
+
+// Initialize the OLED display using brzo_i2c
+// D3 -> SDA
+// D4 -> SCL
+// SSD1306Brzo display(0x3c, D3, D5);
+
+// Initialize the OLED display using Wire library
+SSD1306  display(0x3c, D3, D5);
+
+
+#define DEMO_DURATION 3000
+typedef void (*Demo)(void);
+
+int demoMode = 0;
+int counter = 1;
+
+void setup() {
+  Wire.begin(D3,D4);
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println();
+
+
+  // Initialising the UI will init the display too.
+  display.init();
+
+  display.flipScreenVertically();
+  display.setFont(ArialMT_Plain_10);
+
+}
+
+void drawFontFaceDemo() {
+    // Font Demo1
+    // create more fonts at http://oleddisplay.squix.ch/
+    display.setTextAlignment(TEXT_ALIGN_LEFT);
+    display.setFont(ArialMT_Plain_10);
+    display.drawString(0, 0, "Hello world");
+    display.setFont(ArialMT_Plain_16);
+    display.drawString(0, 10, "Hello world");
+    display.setFont(ArialMT_Plain_24);
+    display.drawString(0, 26, "Hello world");
+}
+
+void drawTextFlowDemo() {
+    display.setFont(ArialMT_Plain_10);
+    display.setTextAlignment(TEXT_ALIGN_LEFT);
+    display.drawStringMaxWidth(0, 0, 128,
+      "Lorem ipsum\n dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore." );
+}
+
+void drawTextAlignmentDemo() {
+    // Text alignment demo
+  display.setFont(ArialMT_Plain_10);
+
+  // The coordinates define the left starting point of the text
+  display.setTextAlignment(TEXT_ALIGN_LEFT);
+  display.drawString(0, 10, "Left aligned (0,10)");
+
+  // The coordinates define the center of the text
+  display.setTextAlignment(TEXT_ALIGN_CENTER);
+  display.drawString(64, 22, "Center aligned (64,22)");
+
+  // The coordinates define the right end of the text
+  display.setTextAlignment(TEXT_ALIGN_RIGHT);
+  display.drawString(128, 33, "Right aligned (128,33)");
+}
+
+void drawRectDemo() {
+      // Draw a pixel at given position
+    for (int i = 0; i < 10; i++) {
+      display.setPixel(i, i);
+      display.setPixel(10 - i, i);
+    }
+    display.drawRect(12, 12, 20, 20);
+
+    // Fill the rectangle
+    display.fillRect(14, 14, 17, 17);
+
+    // Draw a line horizontally
+    display.drawHorizontalLine(0, 40, 20);
+
+    // Draw a line horizontally
+    display.drawVerticalLine(40, 0, 20);
+}
+
+void drawCircleDemo() {
+  for (int i=1; i < 8; i++) {
+    display.setColor(WHITE);
+    display.drawCircle(32, 32, i*3);
+    if (i % 2 == 0) {
+      display.setColor(BLACK);
+    }
+    display.fillCircle(96, 32, 32 - i* 3);
+  }
+}
+
+void drawProgressBarDemo() {
+  int progress = (counter / 5) % 100;
+  // draw the progress bar
+  display.drawProgressBar(0, 32, 120, 10, progress);
+
+  // draw the percentage as String
+  display.setTextAlignment(TEXT_ALIGN_CENTER);
+  display.drawString(64, 15, String(progress) + "%");
+}
+
+void drawImageDemo() {
+    // see http://blog.squix.org/2015/05/esp8266-nodemcu-how-to-create-xbm.html
+    // on how to create xbm files
+    display.drawXbm(34, 14, WiFi_Logo_width, WiFi_Logo_height, WiFi_Logo_bits);
+}
+
+Demo demos[] = {drawFontFaceDemo, drawTextFlowDemo, drawTextAlignmentDemo, drawRectDemo, drawCircleDemo, drawProgressBarDemo, drawImageDemo};
+int demoLength = (sizeof(demos) / sizeof(Demo));
+long timeSinceLastModeSwitch = 0;
+
+void loop() {
+  // clear the display
+  display.clear();
+  // draw the current demo method
+  demos[demoMode]();
+
+  display.setTextAlignment(TEXT_ALIGN_RIGHT);
+  display.drawString(10, 128, String(millis()));
+  // write the buffer to the display
+  display.display();
+
+  if (millis() - timeSinceLastModeSwitch > DEMO_DURATION) {
+    demoMode = (demoMode + 1)  % demoLength;
+    timeSinceLastModeSwitch = millis();
+  }
+  counter++;
+  delay(10);
+}
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306SimpleDemo/images.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306SimpleDemo/images.h
new file mode 100644
index 0000000..9daf8c1
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306SimpleDemo/images.h
@@ -0,0 +1,28 @@
+#define WiFi_Logo_width 60
+#define WiFi_Logo_height 36
+const char WiFi_Logo_bits[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
+  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
+  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
+  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
+  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
+  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
+  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
+  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
+  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
+  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  };
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306UiDemo/SSD1306UiDemo.ino b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306UiDemo/SSD1306UiDemo.ino
new file mode 100644
index 0000000..a51c57c
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306UiDemo/SSD1306UiDemo.ino
@@ -0,0 +1,183 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 by Daniel Eichhorn
+ * Copyright (c) 2016 by Fabrice Weinberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <Wire.h>
+
+// Include the correct display library
+// For a connection via I2C using Wire include
+#include <Wire.h>  // Only needed for Arduino 1.6.5 and earlier
+#include "SSD1306.h" // alias for `#include "SSD1306Wire.h"`
+// For a connection via I2C using brzo_i2c (must be installed) include
+// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Brzo.h"
+// For a connection via SPI include
+// #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
+// #include "SSD1306Spi.h"
+
+// Include the UI lib
+#include "OLEDDisplayUi.h"
+
+// Include custom images
+#include "images.h"
+
+// Use the corresponding display class:
+
+// Initialize the OLED display using SPI
+// D5 -> CLK
+// D7 -> MOSI (DOUT)
+// D0 -> RES
+// D2 -> DC
+// D8 -> CS
+// SSD1306Spi        display(D0, D2, D8);
+
+// Initialize the OLED display using brzo_i2c
+// D3 -> SDA
+// D4 -> SCL
+// SSD1306Brzo display(0x3c, D3, D5);
+
+// Initialize the OLED display using Wire library
+SSD1306  display(0x3c, D3, D5);
+
+OLEDDisplayUi ui     ( &display );
+
+void msOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
+  display->setTextAlignment(TEXT_ALIGN_RIGHT);
+  display->setFont(ArialMT_Plain_10);
+  display->drawString(128, 0, String(millis()));
+}
+
+void drawFrame1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // draw an xbm image.
+  // Please note that everything that should be transitioned
+  // needs to be drawn relative to x and y
+
+  display->drawXbm(x + 34, y + 14, WiFi_Logo_width, WiFi_Logo_height, WiFi_Logo_bits);
+}
+
+void drawFrame2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // Demonstrates the 3 included default sizes. The fonts come from SSD1306Fonts.h file
+  // Besides the default fonts there will be a program to convert TrueType fonts into this format
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->setFont(ArialMT_Plain_10);
+  display->drawString(0 + x, 10 + y, "Arial 10");
+
+  display->setFont(ArialMT_Plain_16);
+  display->drawString(0 + x, 20 + y, "Arial 16");
+
+  display->setFont(ArialMT_Plain_24);
+  display->drawString(0 + x, 34 + y, "Arial 24");
+}
+
+void drawFrame3(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // Text alignment demo
+  display->setFont(ArialMT_Plain_10);
+
+  // The coordinates define the left starting point of the text
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->drawString(0 + x, 11 + y, "Left aligned (0,10)");
+
+  // The coordinates define the center of the text
+  display->setTextAlignment(TEXT_ALIGN_CENTER);
+  display->drawString(64 + x, 22 + y, "Center aligned (64,22)");
+
+  // The coordinates define the right end of the text
+  display->setTextAlignment(TEXT_ALIGN_RIGHT);
+  display->drawString(128 + x, 33 + y, "Right aligned (128,33)");
+}
+
+void drawFrame4(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+  // Demo for drawStringMaxWidth:
+  // with the third parameter you can define the width after which words will be wrapped.
+  // Currently only spaces and "-" are allowed for wrapping
+  display->setTextAlignment(TEXT_ALIGN_LEFT);
+  display->setFont(ArialMT_Plain_10);
+  display->drawStringMaxWidth(0 + x, 10 + y, 128, "Lorem ipsum\n dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore.");
+}
+
+void drawFrame5(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
+
+}
+
+// This array keeps function pointers to all frames
+// frames are the single views that slide in
+FrameCallback frames[] = { drawFrame1, drawFrame2, drawFrame3, drawFrame4, drawFrame5 };
+
+// how many frames are there?
+int frameCount = 5;
+
+// Overlays are statically drawn on top of a frame eg. a clock
+OverlayCallback overlays[] = { msOverlay };
+int overlaysCount = 1;
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println();
+  Serial.println();
+
+	// The ESP is capable of rendering 60fps in 80Mhz mode
+	// but that won't give you much time for anything else
+	// run it in 160Mhz mode or just set it to 30 fps
+  ui.setTargetFPS(60);
+
+	// Customize the active and inactive symbol
+  ui.setActiveSymbol(activeSymbol);
+  ui.setInactiveSymbol(inactiveSymbol);
+
+  // You can change this to
+  // TOP, LEFT, BOTTOM, RIGHT
+  ui.setIndicatorPosition(BOTTOM);
+
+  // Defines where the first frame is located in the bar.
+  ui.setIndicatorDirection(LEFT_RIGHT);
+
+  // You can change the transition that is used
+  // SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
+  ui.setFrameAnimation(SLIDE_LEFT);
+
+  // Add frames
+  ui.setFrames(frames, frameCount);
+
+  // Add overlays
+  ui.setOverlays(overlays, overlaysCount);
+
+  // Initialising the UI will init the display too.
+  ui.init();
+
+  display.flipScreenVertically();
+
+}
+
+
+void loop() {
+  int remainingTimeBudget = ui.update();
+
+  if (remainingTimeBudget > 0) {
+    // You can do some work here
+    // Don't do stuff if you are below your
+    // time budget.
+    delay(remainingTimeBudget);
+  }
+}
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306UiDemo/images.h b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306UiDemo/images.h
new file mode 100644
index 0000000..8b876a3
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/examples/SSD1306UiDemo/images.h
@@ -0,0 +1,50 @@
+#define WiFi_Logo_width 60
+#define WiFi_Logo_height 36
+const char WiFi_Logo_bits[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+  0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+  0x00, 0xFF, 0xFF, 0xFF, 0x07, 0xC0, 0x83, 0x01, 0x80, 0xFF, 0xFF, 0xFF,
+  0x01, 0x00, 0x07, 0x00, 0xC0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x0C, 0x00,
+  0xC0, 0xFF, 0xFF, 0x7C, 0x00, 0x60, 0x0C, 0x00, 0xC0, 0x31, 0x46, 0x7C,
+  0xFC, 0x77, 0x08, 0x00, 0xE0, 0x23, 0xC6, 0x3C, 0xFC, 0x67, 0x18, 0x00,
+  0xE0, 0x23, 0xE4, 0x3F, 0x1C, 0x00, 0x18, 0x00, 0xE0, 0x23, 0x60, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xE0, 0x03, 0x60, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x07, 0x60, 0x3C, 0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C,
+  0xFC, 0x73, 0x18, 0x00, 0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00,
+  0xE0, 0x87, 0x70, 0x3C, 0x1C, 0x70, 0x18, 0x00, 0xE0, 0x8F, 0x71, 0x3C,
+  0x1C, 0x70, 0x18, 0x00, 0xC0, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x08, 0x00,
+  0xC0, 0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x0C, 0x00, 0x80, 0xFF, 0xFF, 0x1F,
+  0x00, 0x00, 0x06, 0x00, 0x80, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x07, 0x00,
+  0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x00, 0x00, 0xF8, 0xFF, 0xFF,
+  0xFF, 0x7F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0xFC, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF,
+  0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0x1F, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x80, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  };
+
+const char activeSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00011000,
+    B00100100,
+    B01000010,
+    B01000010,
+    B00100100,
+    B00011000
+};
+
+const char inactiveSymbol[] PROGMEM = {
+    B00000000,
+    B00000000,
+    B00000000,
+    B00000000,
+    B00011000,
+    B00011000,
+    B00000000,
+    B00000000
+};
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/library.json b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/library.json
new file mode 100644
index 0000000..eff96dc
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/library.json
@@ -0,0 +1,25 @@
+{
+  "name": "ESP8266_SSD1306",
+  "version": "3.2.1",
+  "keywords": "ssd1306, oled, display, i2c",
+  "description": "A I2C display driver for SSD1306 oled displays connected to an ESP8266",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/squix78/esp8266-oled-ssd1306.git"
+  },
+  "authors":
+  [
+    {
+        "name": "Daniel Eichhorn",
+        "email": "squix78@gmail.com",
+        "url": "http://blog.squix.ch"
+    },
+    {
+        "name": "Fabrice Weinberg",
+        "email": "fabrice@weinberg.me"
+    }
+  ],
+  "frameworks": "arduino",
+  "platforms": "espressif"
+}
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/library.properties b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/library.properties
new file mode 100644
index 0000000..6f898ac
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/library.properties
@@ -0,0 +1,9 @@
+name=ESP8266 Oled Driver for SSD1306 display
+version=3.2.1
+author=Daniel Eichhorn, Fabrice Weinberg
+maintainer=Daniel Eichhorn <squix78@gmail.com>
+sentence=A I2C display driver for SSD1306 oled displays connected to an ESP8266
+paragraph=A I2C display driver for SSD1306 oled displays connected to an ESP8266
+category=Display
+url=https://github.com/squix78/esp8266-oled-ssd1306
+architectures=esp8266
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/license b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/license
new file mode 100644
index 0000000..706c10f
--- /dev/null
+++ b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/license
@@ -0,0 +1,24 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 by Daniel Eichhorn
+Copyright (c) 2016 by Fabrice Weinberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+See more at http://blog.squix.ch
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame1.jpg b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame1.jpg
new file mode 100644
index 0000000..536b570
Binary files /dev/null and b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame1.jpg differ
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame2.jpg b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame2.jpg
new file mode 100644
index 0000000..8dccbcd
Binary files /dev/null and b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame2.jpg differ
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame3.jpg b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame3.jpg
new file mode 100644
index 0000000..49e07ab
Binary files /dev/null and b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame3.jpg differ
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame4.jpg b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame4.jpg
new file mode 100644
index 0000000..99cbe1b
Binary files /dev/null and b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/DemoFrame4.jpg differ
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/FontTool.png b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/FontTool.png
new file mode 100644
index 0000000..c7bb222
Binary files /dev/null and b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/FontTool.png differ
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/SPI_version.jpg b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/SPI_version.jpg
new file mode 100644
index 0000000..115c9f3
Binary files /dev/null and b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/SPI_version.jpg differ
diff --git a/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/xbmPreview.png b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/xbmPreview.png
new file mode 100644
index 0000000..70ea3a5
Binary files /dev/null and b/libraries/ESP8266_Oled_Driver_for_SSD1306_display/resources/xbmPreview.png differ
diff --git a/libraries/ESPAsyncTCP/.travis.yml b/libraries/ESPAsyncTCP/.travis.yml
new file mode 100644
index 0000000..9ae1dd7
--- /dev/null
+++ b/libraries/ESPAsyncTCP/.travis.yml
@@ -0,0 +1,49 @@
+sudo: false
+language: bash
+os:
+  - linux
+
+script:
+  - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
+  - sleep 3
+  - export DISPLAY=:1.0
+  - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz
+  - tar xf arduino-1.6.5-linux64.tar.xz
+  - mv arduino-1.6.5 $HOME/arduino_ide
+  - export PATH="$HOME/arduino_ide:$PATH"
+  - which arduino
+  - mkdir -p $HOME/Arduino/libraries
+  - cp -r $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/ESPAsyncTCP
+  - cd $HOME/arduino_ide/hardware
+  - mkdir esp8266com
+  - cd esp8266com
+  - git clone https://github.com/esp8266/Arduino.git esp8266
+  - cd esp8266/tools
+  - python get.py
+  - cd $HOME/arduino_ide/hardware
+  - mkdir espressif
+  - cd espressif
+  - git clone https://github.com/me-no-dev/ESP31B.git ESP31B
+  - cd ESP31B/tools
+  - wget https://github.com/me-no-dev/ESP31B/releases/download/0.0.1/xtensa-esp108-elf-linux64.tar.gz
+  - tar zxvf xtensa-esp108-elf-linux64.tar.gz
+  - chmod +x xtensa-esp108-elf/bin/*
+  - chmod +x xtensa-esp108-elf/xtensa-esp108-elf/bin/*
+  - source $TRAVIS_BUILD_DIR/travis/common.sh
+  - arduino --board esp8266com:esp8266:generic --save-prefs
+  - arduino --get-pref sketchbook.path
+  - build_sketches arduino $HOME/Arduino/libraries/ESPAsyncTCP esp8266
+  - arduino --board espressif:ESP31B:esp31b --save-prefs
+  - arduino --get-pref sketchbook.path
+  - build_sketches arduino $HOME/Arduino/libraries/ESPAsyncTCP esp31b
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/60e65d0c78ea0a920347
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false
diff --git a/libraries/ESPAsyncTCP/LICENSE.txt b/libraries/ESPAsyncTCP/LICENSE.txt
new file mode 100644
index 0000000..65c5ca8
--- /dev/null
+++ b/libraries/ESPAsyncTCP/LICENSE.txt
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/libraries/ESPAsyncTCP/README.md b/libraries/ESPAsyncTCP/README.md
new file mode 100644
index 0000000..5b7421e
--- /dev/null
+++ b/libraries/ESPAsyncTCP/README.md
@@ -0,0 +1,28 @@
+# ESPAsyncTCP [![Build Status](https://travis-ci.org/me-no-dev/ESPAsyncTCP.svg?branch=master)](https://travis-ci.org/me-no-dev/ESPAsyncTCP)
+Async TCP Library for ESP8266 and ESP32/31B Arduino
+
+[![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+This is a fully asynchronous TCP library, aimed at enabling trouble-free, multi-connection network environment for Espressif's ESP8266 and ESP32 MCUs.
+
+This library is the base for [ESPAsyncWebServer](https://github.com/me-no-dev/ESPAsyncWebServer)
+
+## AsyncClient and AsyncServer
+The base classes on which everything else is built. They expose all possible scenarios, but are really raw and require more skills to use.
+
+## AsyncPrinter
+This class can be used to send data like any other ```Print``` interface (```Serial``` for example).
+The object then can be used outside of the Async callbacks (the loop) and receive asynchronously data using ```onData```. The object can be checked if the underlying ```AsyncClient```is connected, or hook to the ```onDisconnect``` callback.
+
+## AsyncTCPbuffer
+This class is really similar to the ```AsyncPrinter```, but it differs in the fact that it can buffer some of the incoming data.
+
+## SyncClient
+It is exactly what it sounds like. This is a standard, blocking TCP Client, similar to the one included in ```ESP8266WiFi```
+
+## Libraries and projects that use AsyncTCP
+- [ESP Async Web Server](https://github.com/me-no-dev/ESPAsyncWebServer)
+- [Async MQTT client](https://github.com/marvinroger/async-mqtt-client)
+- [arduinoWebSockets](https://github.com/Links2004/arduinoWebSockets)
+- [ESP8266 Smart Home](https://github.com/baruch/esp8266_smart_home)
+- [KBox Firmware](https://github.com/sarfata/kbox-firmware)
diff --git a/libraries/ESPAsyncTCP/examples/SyncClient/SyncClient.ino b/libraries/ESPAsyncTCP/examples/SyncClient/SyncClient.ino
new file mode 100644
index 0000000..2037d0d
--- /dev/null
+++ b/libraries/ESPAsyncTCP/examples/SyncClient/SyncClient.ino
@@ -0,0 +1,52 @@
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#include <ESP8266mDNS.h>
+#include <ArduinoOTA.h>
+#else
+#include <ESP31BWiFi.h>
+#endif
+#include "ESPAsyncTCP.h"
+#include "SyncClient.h"
+
+const char* ssid = "**********";
+const char* password = "************";
+
+void setup(){
+  Serial.begin(115200);
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(ssid, password);
+  if (WiFi.waitForConnectResult() != WL_CONNECTED) {
+    Serial.printf("WiFi Failed!\n");
+    return;
+  }
+#ifdef ESP8266
+  ArduinoOTA.begin();
+#endif
+  
+  SyncClient client;
+  if(!client.connect("www.google.com", 80)){
+    Serial.println("Connect Failed");
+    return;
+  }
+  client.setTimeout(2);
+  if(client.printf("GET / HTTP/1.1\r\nHost: www.google.com\r\n\r\n") > 0){
+    while(!client.available())
+      delay(1);
+    while(client.connected()){
+      while(client.connected() && client.available() == 0) delay(1);
+      while(client.connected() && client.available()){
+        Serial.write(client.read());
+      }
+    }
+  } else {
+    client.stop();
+    Serial.println("Send Failed");
+    while(client.connected()) delay(0);
+  }
+}
+
+void loop(){
+#ifdef ESP8266
+  ArduinoOTA.handle();
+#endif
+}
diff --git a/libraries/ESPAsyncTCP/library.json b/libraries/ESPAsyncTCP/library.json
new file mode 100644
index 0000000..744eb1f
--- /dev/null
+++ b/libraries/ESPAsyncTCP/library.json
@@ -0,0 +1,17 @@
+{
+  "name":"ESPAsyncTCP",
+  "description":"Asynchronous TCP Library for ESP8266 and ESP32",
+  "keywords":"async,tcp",
+  "authors":
+  {
+    "name": "Hristo Gochkov",
+    "maintainer": true
+  },
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/me-no-dev/ESPAsyncTCP.git"
+  },
+  "frameworks": "arduino",
+  "platforms":"espressif"
+}
diff --git a/libraries/ESPAsyncTCP/library.properties b/libraries/ESPAsyncTCP/library.properties
new file mode 100644
index 0000000..69ea537
--- /dev/null
+++ b/libraries/ESPAsyncTCP/library.properties
@@ -0,0 +1,9 @@
+name=ESP AsyncTCP
+version=1.0.0
+author=Me-No-Dev
+maintainer=Me-No-Dev
+sentence=Async TCP Library for ESP8266 and ESP31B
+paragraph=Async TCP Library for ESP8266 and ESP31B
+category=Other
+url=https://github.com/me-no-dev/ESPAsyncTCP
+architectures=*
diff --git a/libraries/ESPAsyncTCP/src/AsyncPrinter.cpp b/libraries/ESPAsyncTCP/src/AsyncPrinter.cpp
new file mode 100644
index 0000000..dd61e76
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/AsyncPrinter.cpp
@@ -0,0 +1,187 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "AsyncPrinter.h"
+
+AsyncPrinter::AsyncPrinter()
+  : _client(NULL)
+  , _data_cb(NULL)
+  , _data_arg(NULL)
+  , _close_cb(NULL)
+  , _close_arg(NULL)
+  , _tx_buffer(NULL)
+  , _tx_buffer_size(1460)
+  , next(NULL)
+{}
+
+AsyncPrinter::AsyncPrinter(AsyncClient *client, size_t txBufLen)
+  : _client(client)
+  , _data_cb(NULL)
+  , _data_arg(NULL)
+  , _close_cb(NULL)
+  , _close_arg(NULL)
+  , _tx_buffer(NULL)
+  , _tx_buffer_size(txBufLen)
+  , next(NULL)
+{
+  _attachCallbacks();
+  _tx_buffer = new cbuf(_tx_buffer_size);
+}
+
+AsyncPrinter::~AsyncPrinter(){
+  _on_close();
+}
+
+void AsyncPrinter::onData(ApDataHandler cb, void *arg){
+  _data_cb = cb;
+  _data_arg = arg;
+}
+
+void AsyncPrinter::onClose(ApCloseHandler cb, void *arg){
+  _close_cb = cb;
+  _close_arg = arg;
+}
+
+int AsyncPrinter::connect(IPAddress ip, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((AsyncPrinter*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(ip, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+int AsyncPrinter::connect(const char *host, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((AsyncPrinter*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(host, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+void AsyncPrinter::_onConnect(AsyncClient *c){
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  _tx_buffer = new cbuf(_tx_buffer_size);
+  _attachCallbacks();
+}
+
+AsyncPrinter::operator bool(){ return connected(); }
+
+AsyncPrinter & AsyncPrinter::operator=(const AsyncPrinter &other){
+  if(_client != NULL){
+    _client->close(true);
+    _client = NULL;
+  }
+  _tx_buffer_size = other._tx_buffer_size;
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  _tx_buffer = new cbuf(other._tx_buffer_size);
+  _client = other._client;
+  _attachCallbacks();
+  return *this;
+}
+
+size_t AsyncPrinter::write(uint8_t data){
+  return write(&data, 1);
+}
+
+size_t AsyncPrinter::write(const uint8_t *data, size_t len){
+  if(_tx_buffer == NULL || !connected())
+    return 0;
+  size_t toWrite = 0;
+  size_t toSend = len;
+  while(_tx_buffer->room() < toSend){
+    toWrite = _tx_buffer->room();
+    _tx_buffer->write((const char*)data, toWrite);
+    while(!_client->canSend())
+      delay(0);
+    _sendBuffer();
+    toSend -= toWrite;
+  }
+  _tx_buffer->write((const char*)(data+(len - toSend)), toSend);
+  while(!_client->canSend()) delay(0);
+  _sendBuffer();
+  return len;
+}
+
+bool AsyncPrinter::connected(){
+  return (_client != NULL && _client->connected());
+}
+
+void AsyncPrinter::close(){
+  if(_client != NULL)
+    _client->close(true);
+}
+
+size_t AsyncPrinter::_sendBuffer(){
+  size_t available = _tx_buffer->available();
+  if(!connected() || !_client->canSend() || available == 0)
+    return 0;
+  size_t sendable = _client->space();
+  if(sendable < available)
+    available= sendable;
+  char *out = new char[available];
+  _tx_buffer->read(out, available);
+  size_t sent = _client->write(out, available);
+  delete out;
+  return sent;
+}
+
+void AsyncPrinter::_onData(void *data, size_t len){
+  if(_data_cb)
+    _data_cb(_data_arg, this, (uint8_t*)data, len);
+}
+
+void AsyncPrinter::_on_close(){
+  if(_client != NULL){
+    _client = NULL;
+  }
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  if(_close_cb)
+    _close_cb(_close_arg, this);
+}
+
+void AsyncPrinter::_attachCallbacks(){
+  _client->onPoll([](void *obj, AsyncClient* c){ ((AsyncPrinter*)(obj))->_sendBuffer(); }, this);
+  _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time){ ((AsyncPrinter*)(obj))->_sendBuffer(); }, this);
+  _client->onDisconnect([](void *obj, AsyncClient* c){ ((AsyncPrinter*)(obj))->_on_close(); delete c; }, this);
+  _client->onData([](void *obj, AsyncClient* c, void *data, size_t len){ ((AsyncPrinter*)(obj))->_onData(data, len); }, this);
+}
diff --git a/libraries/ESPAsyncTCP/src/AsyncPrinter.h b/libraries/ESPAsyncTCP/src/AsyncPrinter.h
new file mode 100644
index 0000000..1fa0f8b
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/AsyncPrinter.h
@@ -0,0 +1,73 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ASYNCPRINTER_H_
+#define ASYNCPRINTER_H_
+
+#include "Arduino.h"
+#include "ESPAsyncTCP.h"
+#include "cbuf.h"
+
+class AsyncPrinter;
+
+typedef std::function<void(void*, AsyncPrinter*, uint8_t*, size_t)> ApDataHandler;
+typedef std::function<void(void*, AsyncPrinter*)> ApCloseHandler;
+
+class AsyncPrinter: public Print {
+  private:
+    AsyncClient *_client;
+    ApDataHandler _data_cb;
+    void *_data_arg;
+    ApCloseHandler _close_cb;
+    void *_close_arg;
+    cbuf *_tx_buffer;
+    size_t _tx_buffer_size;
+
+    void _onConnect(AsyncClient *c);
+  public:
+    AsyncPrinter *next;
+
+    AsyncPrinter();
+    AsyncPrinter(AsyncClient *client, size_t txBufLen = 1460);
+    virtual ~AsyncPrinter();
+
+    int connect(IPAddress ip, uint16_t port);
+    int connect(const char *host, uint16_t port);
+
+    void onData(ApDataHandler cb, void *arg);
+    void onClose(ApCloseHandler cb, void *arg);
+
+    operator bool();
+    AsyncPrinter & operator=(const AsyncPrinter &other);
+
+    size_t write(uint8_t data);
+    size_t write(const uint8_t *data, size_t len);
+
+    bool connected();
+    void close();
+
+    size_t _sendBuffer();
+    void _onData(void *data, size_t len);
+    void _on_close();
+    void _attachCallbacks();
+};
+
+#endif /* ASYNCPRINTER_H_ */
diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp b/libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp
new file mode 100644
index 0000000..a894cf8
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/ESPAsyncTCP.cpp
@@ -0,0 +1,673 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "Arduino.h"
+
+#include "ESPAsyncTCP.h"
+extern "C"{
+  #include "lwip/opt.h"
+  #include "lwip/tcp.h"
+  //#include "lwip/tcp_impl.h"
+  #include "lwip/inet.h"
+}
+
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#elif defined(ESP31B)
+#include <ESP31BWiFi.h>
+#else
+#error "UNSUPPORTED ARCHITECTURE"
+#endif
+
+
+static uint16_t _localPort = 10000;
+
+/*
+  Async TCP Client
+*/
+
+AsyncClient::AsyncClient(tcp_pcb* pcb):
+  _connect_cb(0)
+  , _connect_cb_arg(0)
+  , _discard_cb(0)
+  , _discard_cb_arg(0)
+  , _sent_cb(0)
+  , _sent_cb_arg(0)
+  , _error_cb(0)
+  , _error_cb_arg(0)
+  , _recv_cb(0)
+  , _recv_cb_arg(0)
+  , _timeout_cb(0)
+  , _timeout_cb_arg(0)
+  , _refcnt(0)
+  , _pcb_busy(false)
+  , _pcb_sent_at(0)
+  , _close_pcb(false)
+  , _ack_pcb(true)
+  , _rx_last_packet(0)
+  , _rx_since_timeout(0)
+  , prev(NULL)
+  , next(NULL)
+{
+  _pcb = pcb;
+  if(_pcb){
+    tcp_setprio(_pcb, TCP_PRIO_MIN);
+    tcp_arg(_pcb, this);
+    tcp_recv(_pcb, &_s_recv);
+    tcp_sent(_pcb, &_s_sent);
+    tcp_err(_pcb, &_s_error);
+    tcp_poll(_pcb, &_s_poll, 1);
+  }
+}
+
+AsyncClient::~AsyncClient(){
+  if(_pcb)
+    _close();
+}
+
+bool AsyncClient::connect(IPAddress ip, uint16_t port){
+  ip_addr_t addr;
+  addr.addr = ip;
+
+  if (_pcb) //already connected
+    return false;
+
+  netif* interface = ip_route(&addr);
+  if (!interface) //no route to host
+    return false;
+
+  tcp_pcb* pcb = tcp_new();
+  if (!pcb) //could not allocate pcb
+    return false;
+
+  //pcb->local_port = _localPort++;
+
+  tcp_arg(pcb, this);
+  tcp_err(pcb, &_s_error);
+  tcp_connect(pcb, &addr, port,(tcp_connected_fn)&_s_connected);
+  return true;
+}
+
+AsyncClient& AsyncClient::operator=(const AsyncClient& other){
+  if (_pcb)
+    _close();
+
+  _pcb = other._pcb;
+  if (_pcb) {
+    tcp_setprio(_pcb, TCP_PRIO_MIN);
+    tcp_arg(_pcb, this);
+    tcp_recv(_pcb, &_s_recv);
+    tcp_sent(_pcb, &_s_sent);
+    tcp_err(_pcb, &_s_error);
+    tcp_poll(_pcb, &_s_poll, 1);
+  }
+  return *this;
+}
+
+bool AsyncClient::operator==(const AsyncClient &other) {
+#ifdef ESP8266
+  return (_pcb != NULL && other._pcb != NULL && (_pcb->remote_ip.addr == other._pcb->remote_ip.addr) && (_pcb->remote_port == other._pcb->remote_port));
+#else
+  return (_pcb != NULL && other._pcb != NULL && (_pcb->remote_ip.ip4.addr == other._pcb->remote_ip.ip4.addr) && (_pcb->remote_port == other._pcb->remote_port));
+#endif
+}
+
+int8_t AsyncClient::abort(){
+  if(_pcb) {
+    tcp_abort(_pcb);
+    _pcb = NULL;
+  }
+  return ERR_ABRT;
+}
+
+void AsyncClient::close(bool now){
+  tcp_recved(_pcb, _rx_ack_len);
+  if(now)
+    _close();
+  else
+    _close_pcb = true;
+}
+
+void AsyncClient::stop() {
+  close(false);
+}
+
+bool AsyncClient::free(){
+  if(!_pcb)
+    return true;
+  if(_pcb->state == 0 || _pcb->state > 4)
+    return true;
+  return false;
+}
+
+size_t AsyncClient::write(const char* data) {
+  if(data == NULL)
+    return 0;
+  return write(data, strlen(data));
+}
+
+size_t AsyncClient::write(const char* data, size_t size) {
+  if(!_pcb || size == 0 || data == NULL)
+    return 0;
+  if(!canSend())
+    return 0;
+  size_t room = tcp_sndbuf(_pcb);
+  size_t will_send = (room < size) ? room : size;
+  int8_t err = tcp_write(_pcb, data, will_send, 0);
+  if(err != ERR_OK)
+    return 0;
+  err = tcp_output(_pcb);
+  if(err != ERR_OK)
+    return 0;
+  _pcb_sent_at = millis();
+  _pcb_busy = true;
+  if(will_send < size){
+    size_t left = size - will_send;
+    return will_send + write(data+will_send, left);
+  }
+  return size;
+}
+
+size_t AsyncClient::add(const char* data, size_t size) {
+  if(!_pcb || size == 0 || data == NULL)
+    return 0;
+  size_t room = tcp_sndbuf(_pcb);
+  if(!room)
+    return 0;
+  size_t will_send = (room < size) ? room : size;
+  int8_t err = tcp_write(_pcb, data, will_send, 0);
+  if(err != ERR_OK)
+    return 0;
+  return will_send;
+}
+
+bool AsyncClient::send(){
+  if(!canSend())
+    return false;
+  if(tcp_output(_pcb) == ERR_OK){
+    _pcb_busy = true;
+    _pcb_sent_at = millis();
+    return true;
+  }
+  return false;
+}
+
+size_t AsyncClient::ack(size_t len){
+  if(len > _rx_ack_len)
+    len = _rx_ack_len;
+  if(len)
+    tcp_recved(_pcb, len);
+  _rx_ack_len -= len;
+  return len;
+}
+
+// Private Callbacks
+
+int8_t AsyncClient::_close(){
+  int8_t err = ERR_OK;
+  if(_pcb) {
+    tcp_arg(_pcb, NULL);
+    tcp_sent(_pcb, NULL);
+    tcp_recv(_pcb, NULL);
+    tcp_err(_pcb, NULL);
+    tcp_poll(_pcb, NULL, 0);
+    err = tcp_close(_pcb);
+    if(err != ERR_OK) {
+      err = abort();
+    }
+    _pcb = NULL;
+    if(_discard_cb)
+      _discard_cb(_discard_cb_arg, this);
+  }
+  return err;
+}
+
+int8_t AsyncClient::_connected(void* pcb, int8_t err){
+  _pcb = reinterpret_cast<tcp_pcb*>(pcb);
+  if(_pcb){
+    tcp_setprio(_pcb, TCP_PRIO_MIN);
+    tcp_recv(_pcb, &_s_recv);
+    tcp_sent(_pcb, &_s_sent);
+    tcp_poll(_pcb, &_s_poll, 1);
+    _pcb_busy = false;
+  }
+  if(_connect_cb)
+    _connect_cb(_connect_cb_arg, this);
+  return ERR_OK;
+}
+
+void AsyncClient::_error(int8_t err) {
+  if(_pcb){
+    tcp_arg(_pcb, NULL);
+    tcp_sent(_pcb, NULL);
+    tcp_recv(_pcb, NULL);
+    tcp_err(_pcb, NULL);
+    tcp_poll(_pcb, NULL, 0);
+    _pcb = NULL;
+  }
+  if(_error_cb)
+    _error_cb(_error_cb_arg, this, err);
+  if(_discard_cb)
+    _discard_cb(_discard_cb_arg, this);
+}
+
+int8_t AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) {
+  _rx_last_packet = millis();
+  _pcb_busy = false;
+  if(_sent_cb)
+    _sent_cb(_sent_cb_arg, this, len, (millis() - _pcb_sent_at));
+  return ERR_OK;
+}
+
+int8_t AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, int8_t err) {
+  if(pb == 0){
+    return _close();
+  }
+
+  _rx_last_packet = millis();
+  //use callback (onData defined)
+  while(pb != NULL){
+    //we should not ack before we assimilate the data
+    _ack_pcb = true;
+    pbuf *b = pb;
+    if(_recv_cb)
+      _recv_cb(_recv_cb_arg, this, b->payload, b->len);
+    if(!_ack_pcb)
+      _rx_ack_len += b->len;
+    else
+      tcp_recved(pcb, b->len);
+    //pb = pbuf_dechain(b);
+    pb = b->next;
+    b->next = NULL;
+    pbuf_free(b);
+  }
+  return ERR_OK;
+}
+
+int8_t AsyncClient::_poll(tcp_pcb* pcb){
+  // Close requested
+  if(_close_pcb){
+    _close_pcb = false;
+    _close();
+    return ERR_OK;
+  }
+  uint32_t now = millis();
+  // ACK Timeout
+  if(_pcb_busy && (now - _pcb_sent_at) >= ASYNC_MAX_ACK_TIME){
+    _pcb_busy = false;
+    if(_timeout_cb)
+      _timeout_cb(_timeout_cb_arg, this, (now - _pcb_sent_at));
+    return ERR_OK;
+  }
+  // RX Timeout
+  if(_rx_since_timeout && now - _rx_last_packet >= _rx_since_timeout * 1000){
+    _close();
+    return ERR_OK;
+  }
+  // Everything is fine
+  if(_poll_cb)
+    _poll_cb(_poll_cb_arg, this);
+  return ERR_OK;
+}
+
+// lWIP Callbacks
+
+int8_t AsyncClient::_s_poll(void *arg, struct tcp_pcb *tpcb) {
+  return reinterpret_cast<AsyncClient*>(arg)->_poll(tpcb);
+}
+
+int8_t AsyncClient::_s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, int8_t err) {
+  return reinterpret_cast<AsyncClient*>(arg)->_recv(tpcb, pb, err);
+}
+
+void AsyncClient::_s_error(void *arg, int8_t err) {
+  reinterpret_cast<AsyncClient*>(arg)->_error(err);
+}
+
+int8_t AsyncClient::_s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len) {
+  return reinterpret_cast<AsyncClient*>(arg)->_sent(tpcb, len);
+}
+
+int8_t AsyncClient::_s_connected(void* arg, void* tpcb, int8_t err){
+    return reinterpret_cast<AsyncClient*>(arg)->_connected(tpcb, err);
+}
+
+// Operators
+
+AsyncClient & AsyncClient::operator+=(const AsyncClient &other) {
+  if(next == NULL){
+    next = (AsyncClient*)(&other);
+    next->prev = this;
+  } else {
+    AsyncClient *c = next;
+    while(c->next != NULL) c = c->next;
+    c->next =(AsyncClient*)(&other);
+    c->next->prev = c;
+  }
+  return *this;
+}
+
+
+// Make this async
+bool AsyncClient::connect(const char* host, uint16_t port){
+  IPAddress remote_addr;
+  if (WiFi.hostByName(host, remote_addr))
+    return connect(remote_addr, port);
+  return false;
+}
+
+void AsyncClient::setRxTimeout(uint32_t timeout){
+  _rx_since_timeout = timeout;
+}
+
+uint32_t AsyncClient::getRxTimeout(){
+  return _rx_since_timeout;
+}
+
+void AsyncClient::setNoDelay(bool nodelay){
+  if(!_pcb)
+    return;
+  if(nodelay)
+    tcp_nagle_disable(_pcb);
+  else
+    tcp_nagle_enable(_pcb);
+}
+
+bool AsyncClient::getNoDelay(){
+  if(!_pcb)
+    return false;
+  return tcp_nagle_disabled(_pcb);
+}
+
+uint32_t AsyncClient::getRemoteAddress() {
+  if(!_pcb)
+    return 0;
+#ifdef ESP8266
+  return _pcb->remote_ip.addr;
+#else
+  return _pcb->remote_ip.ip4.addr;
+#endif
+}
+
+uint16_t AsyncClient::getRemotePort() {
+  if(!_pcb)
+    return 0;
+  return _pcb->remote_port;
+}
+
+uint32_t AsyncClient::getLocalAddress() {
+  if(!_pcb)
+    return 0;
+#ifdef ESP8266
+  return _pcb->local_ip.addr;
+#else
+  return _pcb->local_ip.ip4.addr;
+#endif
+}
+
+uint16_t AsyncClient::getLocalPort() {
+  if(!_pcb)
+    return 0;
+  return _pcb->local_port;
+}
+
+IPAddress AsyncClient::remoteIP() {
+  return IPAddress(getRemoteAddress());
+}
+
+uint16_t AsyncClient::remotePort() {
+  return getRemotePort();
+}
+
+IPAddress AsyncClient::localIP() {
+  return IPAddress(getLocalAddress());
+}
+
+uint16_t AsyncClient::localPort() {
+  return getLocalPort();
+}
+
+uint8_t AsyncClient::state() {
+  if(!_pcb)
+    return 0;
+  return _pcb->state;
+}
+
+bool AsyncClient::connected(){
+  if (!_pcb)
+    return false;
+  return _pcb->state == 4;
+}
+
+bool AsyncClient::connecting(){
+  if (!_pcb)
+    return false;
+  return _pcb->state > 0 && _pcb->state < 4;
+}
+
+bool AsyncClient::disconnecting(){
+  if (!_pcb)
+    return false;
+  return _pcb->state > 4 && _pcb->state < 10;
+}
+
+bool AsyncClient::disconnected(){
+  if (!_pcb)
+    return true;
+  return _pcb->state == 0 || _pcb->state == 10;
+}
+
+bool AsyncClient::freeable(){
+  if (!_pcb)
+    return true;
+  return _pcb->state == 0 || _pcb->state > 4;
+}
+
+bool AsyncClient::canSend(){
+  return space() > 0;
+}
+
+
+// Callback Setters
+
+void AsyncClient::onConnect(AcConnectHandler cb, void* arg){
+  _connect_cb = cb;
+  _connect_cb_arg = arg;
+}
+
+void AsyncClient::onDisconnect(AcConnectHandler cb, void* arg){
+  _discard_cb = cb;
+  _discard_cb_arg = arg;
+}
+
+void AsyncClient::onAck(AcAckHandler cb, void* arg){
+  _sent_cb = cb;
+  _sent_cb_arg = arg;
+}
+
+void AsyncClient::onError(AcErrorHandler cb, void* arg){
+  _error_cb = cb;
+  _error_cb_arg = arg;
+}
+
+void AsyncClient::onData(AcDataHandler cb, void* arg){
+  _recv_cb = cb;
+  _recv_cb_arg = arg;
+}
+
+void AsyncClient::onTimeout(AcTimeoutHandler cb, void* arg){
+  _timeout_cb = cb;
+  _timeout_cb_arg = arg;
+}
+
+void AsyncClient::onPoll(AcConnectHandler cb, void* arg){
+  _poll_cb = cb;
+  _poll_cb_arg = arg;
+}
+
+
+size_t AsyncClient::space(){
+  if((_pcb != NULL) && (_pcb->state == 4))
+    return _pcb->snd_buf;
+  return 0;
+}
+
+const char * AsyncClient::errorToString(int8_t error){
+  switch(error){
+    case 0: return "OK";
+    case -1: return "Out of memory error";
+    case -2: return "Buffer error";
+    case -3: return "Timeout";
+    case -4: return "Routing problem";
+    case -5: return "Operation in progress";
+    case -6: return "Illegal value";
+    case -7: return "Operation would block";
+    case -8: return "Connection aborted";
+    case -9: return "Connection reset";
+    case -10: return "Connection closed";
+    case -11: return "Not connected";
+    case -12: return "Illegal argument";
+    case -13: return "Address in use";
+    case -14: return "Low-level netif error";
+    case -15: return "Already connected";
+    default: return "UNKNOWN";
+  }
+}
+
+const char * AsyncClient::stateToString(){
+  switch(state()){
+    case 0: return "Closed";
+    case 1: return "Listen";
+    case 2: return "SYN Sent";
+    case 3: return "SYN Received";
+    case 4: return "Established";
+    case 5: return "FIN Wait 1";
+    case 6: return "FIN Wait 2";
+    case 7: return "Close Wait";
+    case 8: return "Closing";
+    case 9: return "Last ACK";
+    case 10: return "Time Wait";
+    default: return "UNKNOWN";
+  }
+}
+
+/*
+  Async TCP Server
+*/
+
+AsyncServer::AsyncServer(IPAddress addr, uint16_t port)
+  : _port(port)
+  , _addr(addr)
+  , _noDelay(false)
+  , _pcb(0)
+  , _connect_cb(0)
+  , _connect_cb_arg(0)
+{}
+
+AsyncServer::AsyncServer(uint16_t port)
+  : _port(port)
+  , _addr((uint32_t) IPADDR_ANY)
+  , _noDelay(false)
+  , _pcb(0)
+  , _connect_cb(0)
+  , _connect_cb_arg(0)
+{}
+
+AsyncServer::~AsyncServer(){}
+
+void AsyncServer::onClient(AcConnectHandler cb, void* arg){
+  _connect_cb = cb;
+  _connect_cb_arg = arg;
+}
+
+void AsyncServer::begin(){
+  if(_pcb)
+    return;
+
+  int8_t err;
+  tcp_pcb* pcb = tcp_new();
+  if (!pcb)
+    return;
+
+  ip_addr_t local_addr;
+  local_addr.addr = (uint32_t) _addr;
+  err = tcp_bind(pcb, &local_addr, _port);
+
+  if (err != ERR_OK) {
+    tcp_close(pcb);
+    return;
+  }
+
+  tcp_pcb* listen_pcb = tcp_listen(pcb);
+  if (!listen_pcb) {
+    tcp_close(pcb);
+    return;
+  }
+  _pcb = listen_pcb;
+  tcp_arg(_pcb, (void*) this);
+  tcp_accept(_pcb, _s_accept);
+}
+
+void AsyncServer::end(){
+  if(_pcb){
+    //cleanup all connections?
+    tcp_abort(_pcb);
+    tcp_arg(_pcb, NULL);
+    tcp_accept(_pcb, NULL);
+    _pcb = NULL;
+  }
+}
+
+void AsyncServer::setNoDelay(bool nodelay){
+  _noDelay = nodelay;
+}
+
+bool AsyncServer::getNoDelay(){
+  return _noDelay;
+}
+
+uint8_t AsyncServer::status(){
+  if (!_pcb)
+    return 0;
+  return _pcb->state;
+}
+
+int8_t AsyncServer::_accept(tcp_pcb* pcb, int8_t err){
+  if(_connect_cb){
+    if (_noDelay)
+      tcp_nagle_disable(pcb);
+    else
+      tcp_nagle_enable(pcb);
+    AsyncClient *c = new AsyncClient(pcb);
+    if(c){
+      _connect_cb(_connect_cb_arg, c);
+      return ERR_OK;
+    }
+  }
+  if(tcp_close(pcb) != ERR_OK){
+    tcp_abort(pcb);
+  }
+  return ERR_OK;
+}
+
+int8_t AsyncServer::_s_accept(void *arg, tcp_pcb* pcb, int8_t err){
+  return reinterpret_cast<AsyncServer*>(arg)->_accept(pcb, err);
+}
diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCP.h b/libraries/ESPAsyncTCP/src/ESPAsyncTCP.h
new file mode 100644
index 0000000..ccc8d46
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/ESPAsyncTCP.h
@@ -0,0 +1,179 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ASYNCTCP_H_
+#define ASYNCTCP_H_
+
+
+
+#include "IPAddress.h"
+#include <functional>
+
+#define USE_ASYNC_BUFFER 0
+#define SERVER_KEEP_CLIENTS 0
+#define CLIENT_SYNC_API 0
+
+class AsyncClient;
+
+#define ASYNC_MAX_ACK_TIME 5000
+
+typedef std::function<void(void*, AsyncClient*)> AcConnectHandler;
+typedef std::function<void(void*, AsyncClient*, size_t len, uint32_t time)> AcAckHandler;
+typedef std::function<void(void*, AsyncClient*, int8_t error)> AcErrorHandler;
+typedef std::function<void(void*, AsyncClient*, void *data, size_t len)> AcDataHandler;
+typedef std::function<void(void*, AsyncClient*, uint32_t time)> AcTimeoutHandler;
+
+struct tcp_pcb;
+struct pbuf;
+
+class AsyncClient {
+  protected:
+    friend class AsyncTCPbuffer;
+    tcp_pcb* _pcb;
+    AcConnectHandler _connect_cb;
+    void* _connect_cb_arg;
+    AcConnectHandler _discard_cb;
+    void* _discard_cb_arg;
+    AcAckHandler _sent_cb;
+    void* _sent_cb_arg;
+    AcErrorHandler _error_cb;
+    void* _error_cb_arg;
+    AcDataHandler _recv_cb;
+    void* _recv_cb_arg;
+    AcTimeoutHandler _timeout_cb;
+    void* _timeout_cb_arg;
+    AcConnectHandler _poll_cb;
+    void* _poll_cb_arg;
+    int _refcnt;
+    bool _pcb_busy;
+    uint32_t _pcb_sent_at;
+    bool _close_pcb;
+    bool _ack_pcb;
+    uint32_t _rx_ack_len;
+    uint32_t _rx_last_packet;
+    uint32_t _rx_since_timeout;
+
+    int8_t _close();
+    int8_t _connected(void* pcb, int8_t err);
+    void _error(int8_t err);
+    int8_t _poll(tcp_pcb* pcb);
+    int8_t _sent(tcp_pcb* pcb, uint16_t len);
+    int8_t _recv(tcp_pcb* pcb, pbuf* pb, int8_t err);
+    static int8_t _s_poll(void *arg, struct tcp_pcb *tpcb);
+    static int8_t _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, int8_t err);
+    static void _s_error(void *arg, int8_t err);
+    static int8_t _s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len);
+    static int8_t _s_connected(void* arg, void* tpcb, int8_t err);
+
+  public:
+    AsyncClient* prev;
+    AsyncClient* next;
+
+    AsyncClient(tcp_pcb* pcb = 0);
+    ~AsyncClient();
+
+    AsyncClient & operator=(const AsyncClient &other);
+    AsyncClient & operator+=(const AsyncClient &other);
+
+    bool operator==(const AsyncClient &other);
+
+    bool operator!=(const AsyncClient &other) {
+      return !(*this == other);
+    }
+
+    bool connect(IPAddress ip, uint16_t port);
+    bool connect(const char* host, uint16_t port);
+    void close(bool now = false);
+    void stop();
+    int8_t abort();
+    bool free();
+
+    bool canSend();//ack is not pending
+    size_t space();
+    size_t add(const char* data, size_t size);//add for sending
+    bool send();//send all data added with the method above
+    size_t ack(size_t len); //ack data that you have not acked using the method below
+    void ackLater(){ _ack_pcb = false; } //will not ack the current packet. Call from onData
+
+
+    size_t write(const char* data);
+    size_t write(const char* data, size_t size); //only when canSend() == true
+
+    uint8_t state();
+    bool connecting();
+    bool connected();
+    bool disconnecting();
+    bool disconnected();
+    bool freeable();//disconnected or disconnecting
+
+    uint32_t getRxTimeout();
+    void setRxTimeout(uint32_t timeout);//no RX data timeout for the connection in seconds
+    void setNoDelay(bool nodelay);
+    bool getNoDelay();
+    uint32_t getRemoteAddress();
+    uint16_t getRemotePort();
+    uint32_t getLocalAddress();
+    uint16_t getLocalPort();
+
+    IPAddress remoteIP();
+    uint16_t  remotePort();
+    IPAddress localIP();
+    uint16_t  localPort();
+
+    void onConnect(AcConnectHandler cb, void* arg = 0);     //on successful connect
+    void onDisconnect(AcConnectHandler cb, void* arg = 0);  //disconnected
+    void onAck(AcAckHandler cb, void* arg = 0);             //ack received
+    void onError(AcErrorHandler cb, void* arg = 0);         //unsuccessful connect or error
+    void onData(AcDataHandler cb, void* arg = 0);           //data received
+    void onTimeout(AcTimeoutHandler cb, void* arg = 0);     //ack timeout
+    void onPoll(AcConnectHandler cb, void* arg = 0);        //every 125ms when connected
+
+    const char * errorToString(int8_t error);
+    const char * stateToString();
+};
+
+class AsyncServer {
+  protected:
+    uint16_t _port;
+    IPAddress _addr;
+    bool _noDelay;
+    tcp_pcb* _pcb;
+    AcConnectHandler _connect_cb;
+    void* _connect_cb_arg;
+
+  public:
+    AsyncServer(IPAddress addr, uint16_t port);
+    AsyncServer(uint16_t port);
+    ~AsyncServer();
+    void onClient(AcConnectHandler cb, void* arg);
+    void begin();
+    void end();
+    void setNoDelay(bool nodelay);
+    bool getNoDelay();
+    uint8_t status();
+
+  protected:
+    int8_t _accept(tcp_pcb* newpcb, int8_t err);
+    static int8_t _s_accept(void *arg, tcp_pcb* newpcb, int8_t err);
+};
+
+
+#endif /* ASYNCTCP_H_ */
diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp b/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp
new file mode 100644
index 0000000..7bca134
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.cpp
@@ -0,0 +1,541 @@
+/**
+ * @file  ESPAsyncTCPbuffer.cpp
+ * @date  22.01.2016
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the Asynv TCP for ESP.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+
+#include <Arduino.h>
+#include <debug.h>
+
+#include "ESPAsyncTCPbuffer.h"
+
+
+AsyncTCPbuffer::AsyncTCPbuffer(AsyncClient* client) {
+    if(client == NULL) {
+        DEBUG_ASYNC_TCP("[A-TCP] client is null!!!\n");
+        panic();
+    }
+
+    _client = client;
+    _TXbufferWrite = new cbuf(1460);
+    _TXbufferRead = _TXbufferWrite;
+    _RXbuffer = new cbuf(100);
+    _RXmode = ATB_RX_MODE_FREE;
+    _rxSize = 0;
+    _rxTerminator = 0x00;
+    _rxReadBytesPtr = NULL;
+    _rxReadStringPtr = NULL;
+    _cbDisconnect = NULL;
+
+    _cbRX = NULL;
+    _cbDone = NULL;
+    _attachCallbacks();
+}
+
+AsyncTCPbuffer::~AsyncTCPbuffer() {
+    if(_client) {
+        _client->close();
+    }
+
+    if(_RXbuffer) {
+        delete _RXbuffer;
+        _RXbuffer = NULL;
+    }
+
+    if(_TXbufferWrite) {
+        // will be deleted in _TXbufferRead chain
+        _TXbufferWrite = NULL;
+    }
+
+    if(_TXbufferRead) {
+        cbuf * next = _TXbufferRead->next;
+        delete _TXbufferRead;
+        while(next != NULL) {
+            _TXbufferRead = next;
+            next = _TXbufferRead->next;
+            delete _TXbufferRead;
+        }
+        _TXbufferRead = NULL;
+    }
+}
+
+size_t AsyncTCPbuffer::write(String & data) {
+    return write(data.c_str(), data.length());
+}
+
+size_t AsyncTCPbuffer::write(uint8_t data) {
+    return write(&data, 1);
+}
+
+size_t AsyncTCPbuffer::write(const char* data) {
+    return write((const uint8_t *) data, strlen(data));
+}
+
+size_t AsyncTCPbuffer::write(const char *data, size_t len) {
+    return write((const uint8_t *) data, len);
+}
+
+/**
+ * write data in to buffer and try to send the data
+ * @param data
+ * @param len
+ * @return
+ */
+size_t AsyncTCPbuffer::write(const uint8_t *data, size_t len) {
+    if(_TXbufferWrite == NULL || _client == NULL || !_client->connected() || data == NULL || len == 0) {
+        return 0;
+    }
+
+    size_t bytesLeft = len;
+    while(bytesLeft) {
+        size_t w = _TXbufferWrite->write((const char*) data, bytesLeft);
+        bytesLeft -= w;
+        data += w;
+        _sendBuffer();
+
+        // add new buffer since we have more data
+        if(_TXbufferWrite->full() && bytesLeft > 0) {
+
+            // to less ram!!!
+            if(ESP.getFreeHeap() < 4096) {
+                DEBUG_ASYNC_TCP("[A-TCP] run out of Heap can not send all Data!\n");
+                return (len - bytesLeft);
+            }
+
+            cbuf * next = new cbuf(1460);
+
+            if(next == NULL) {
+                DEBUG_ASYNC_TCP("[A-TCP] run out of Heap!\n");
+                panic();
+            } else {
+                DEBUG_ASYNC_TCP("[A-TCP] new cbuf\n");
+            }
+
+            // add new buffer to chain (current cbuf)
+            _TXbufferWrite->next = next;
+
+            // move ptr for next data
+            _TXbufferWrite = next;
+        }
+    }
+
+    return len;
+
+}
+
+/**
+ * wait until all data has send out
+ */
+void AsyncTCPbuffer::flush() {
+    while(!_TXbufferWrite->empty()) {
+        while(!_client->canSend()) {
+            delay(0);
+        }
+        _sendBuffer();
+    }
+}
+
+void AsyncTCPbuffer::noCallback() {
+    _RXmode = ATB_RX_MODE_NONE;
+}
+
+void AsyncTCPbuffer::readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] readStringUntil terminator: %02X\n", terminator);
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = done;
+    _rxReadStringPtr = str;
+    _rxTerminator = terminator;
+    _rxSize = 0;
+    _RXmode = ATB_RX_MODE_TERMINATOR_STRING;
+}
+
+/*
+ void AsyncTCPbuffer::readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+ _RXmode = ATB_RX_MODE_NONE;
+ _cbDone = done;
+ _rxReadBytesPtr = (uint8_t *) buffer;
+ _rxTerminator = terminator;
+ _rxSize = length;
+ _RXmode = ATB_RX_MODE_TERMINATOR;
+ _handleRxBuffer(NULL, 0);
+ }
+
+ void AsyncTCPbuffer::readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+ readBytesUntil(terminator, (char *) buffer, length, done);
+ }
+ */
+
+void AsyncTCPbuffer::readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] readBytes length: %d\n", length);
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = done;
+    _rxReadBytesPtr = (uint8_t *) buffer;
+    _rxSize = length;
+    _RXmode = ATB_RX_MODE_READ_BYTES;
+}
+
+void AsyncTCPbuffer::readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+    readBytes((char *) buffer, length, done);
+}
+
+void AsyncTCPbuffer::onData(AsyncTCPbufferDataCb cb) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] onData\n");
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = NULL;
+    _cbRX = cb;
+    _RXmode = ATB_RX_MODE_FREE;
+}
+
+void AsyncTCPbuffer::onDisconnect(AsyncTCPbufferDisconnectCb cb) {
+    _cbDisconnect = cb;
+}
+
+IPAddress AsyncTCPbuffer::remoteIP() {
+    if(!_client) {
+        return IPAddress(0U);
+    }
+    return _client->remoteIP();
+}
+
+uint16_t AsyncTCPbuffer::remotePort() {
+    if(!_client) {
+        return 0;
+    }
+    return _client->remotePort();
+}
+
+bool AsyncTCPbuffer::connected() {
+    if(!_client) {
+        return false;
+    }
+    return _client->connected();
+}
+
+void AsyncTCPbuffer::stop() {
+
+    if(!_client) {
+        return;
+    }
+    _client->stop();
+    _client = NULL;
+
+    if(_cbDone) {
+        switch(_RXmode) {
+            case ATB_RX_MODE_READ_BYTES:
+            case ATB_RX_MODE_TERMINATOR:
+            case ATB_RX_MODE_TERMINATOR_STRING:
+                _RXmode = ATB_RX_MODE_NONE;
+                _cbDone(false, NULL);
+                break;
+            default:
+              break;
+        }
+    }
+    _RXmode = ATB_RX_MODE_NONE;
+}
+
+void AsyncTCPbuffer::close() {
+    stop();
+}
+
+
+///--------------------------------
+
+/**
+ * attachCallbacks to AsyncClient class
+ */
+void AsyncTCPbuffer::_attachCallbacks() {
+    if(!_client) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks\n");
+
+    _client->onPoll([](void *obj, AsyncClient* c) {
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        if((b->_TXbufferRead != NULL) && !b->_TXbufferRead->empty()) {
+            b->_sendBuffer();
+        }
+        //    if(!b->_RXbuffer->empty()) {
+        //       b->_handleRxBuffer(NULL, 0);
+        //   }
+    }, this);
+
+    _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time) {
+        DEBUG_ASYNC_TCP("[A-TCP] onAck\n");
+        ((AsyncTCPbuffer*)(obj))->_sendBuffer();
+    }, this);
+
+    _client->onDisconnect([](void *obj, AsyncClient* c) {
+        DEBUG_ASYNC_TCP("[A-TCP] onDisconnect\n");
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        b->_client = NULL;
+        bool del = true;
+        if(b->_cbDisconnect) {
+            del = b->_cbDisconnect(b);
+        }
+        delete c;
+        if(del) {
+            delete b;
+        }
+    }, this);
+
+    _client->onData([](void *obj, AsyncClient* c, void *buf, size_t len) {
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        b->_rxData((uint8_t *)buf, len);
+    }, this);
+
+    _client->onTimeout([](void *obj, AsyncClient* c, uint32_t time){
+        DEBUG_ASYNC_TCP("[A-TCP] onTimeout\n");
+        c->close();
+    }, this);
+
+    DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks Done.\n");
+}
+
+/**
+ * send TX buffer if possible
+ */
+void AsyncTCPbuffer::_sendBuffer() {
+    //DEBUG_ASYNC_TCP("[A-TCP] _sendBuffer...\n");
+    size_t available = _TXbufferRead->available();
+    if(available == 0 || _client == NULL || !_client->connected() || !_client->canSend()) {
+        return;
+    }
+
+    while((_client->space() > 0) && (_TXbufferRead->available() > 0) && _client->canSend()) {
+
+        available = _TXbufferRead->available();
+
+        if(available > _client->space()) {
+            available = _client->space();
+        }
+
+        char *out = new char[available];
+        if(out == NULL) {
+            DEBUG_ASYNC_TCP("[A-TCP] to less heap, try later.\n");
+            return;
+        }
+
+        // read data from buffer
+        _TXbufferRead->peek(out, available);
+
+        // send data
+        size_t send = _client->write((const char*) out, available);
+        if(send != available) {
+            DEBUG_ASYNC_TCP("[A-TCP] write failed send: %d available: %d \n", send, available);
+        }
+
+        // remove really send data from buffer
+        _TXbufferRead->remove(send);
+
+        // if buffer is empty and there is a other buffer in chain delete the empty one
+        if(_TXbufferRead->available() == 0 && _TXbufferRead->next != NULL) {
+            cbuf * old = _TXbufferRead;
+            _TXbufferRead = _TXbufferRead->next;
+            delete old;
+            DEBUG_ASYNC_TCP("[A-TCP] delete cbuf\n");
+        }
+
+        delete out;
+    }
+
+}
+
+/**
+ * called on incoming data
+ * @param buf
+ * @param len
+ */
+void AsyncTCPbuffer::_rxData(uint8_t *buf, size_t len) {
+    if(!_client || !_client->connected()) {
+        DEBUG_ASYNC_TCP("[A-TCP] not connected!\n");
+        return;
+    }
+    if(!_RXbuffer) {
+        DEBUG_ASYNC_TCP("[A-TCP] _rxData no _RXbuffer!\n");
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] _rxData len: %d RXmode: %d\n", len, _RXmode);
+
+    size_t handled = 0;
+
+    if(_RXmode != ATB_RX_MODE_NONE) {
+        handled = _handleRxBuffer((uint8_t *) buf, len);
+        buf += handled;
+        len -= handled;
+
+        // handle as much as possible before using the buffer
+        if(_RXbuffer->empty()) {
+            while(_RXmode != ATB_RX_MODE_NONE && handled != 0 && len > 0) {
+                handled = _handleRxBuffer(buf, len);
+                buf += handled;
+                len -= handled;
+            }
+        }
+    }
+
+    if(len > 0) {
+
+        if(_RXbuffer->room() < len) {
+            // to less space
+            DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer full try resize\n");
+            _RXbuffer->resizeAdd((len + _RXbuffer->room()));
+
+            if(_RXbuffer->room() < len) {
+                DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer to full can only handle %d!!!\n", _RXbuffer->room());
+            }
+        }
+
+        _RXbuffer->write((const char *) (buf), len);
+    }
+
+    if(!_RXbuffer->empty() && _RXmode != ATB_RX_MODE_NONE) {
+        // handle as much as possible data in buffer
+        handled = _handleRxBuffer(NULL, 0);
+        while(_RXmode != ATB_RX_MODE_NONE && handled != 0) {
+            handled = _handleRxBuffer(NULL, 0);
+        }
+    }
+
+    // clean up ram
+    if(_RXbuffer->empty() && _RXbuffer->room() != 100) {
+        _RXbuffer->resize(100);
+    }
+
+}
+
+/**
+ *
+ */
+size_t AsyncTCPbuffer::_handleRxBuffer(uint8_t *buf, size_t len) {
+    if(!_client || !_client->connected() || _RXbuffer == NULL) {
+        return 0;
+    }
+
+    DEBUG_ASYNC_TCP("[A-TCP] _handleRxBuffer len: %d RXmode: %d\n", len, _RXmode);
+
+    size_t BufferAvailable = _RXbuffer->available();
+    size_t r = 0;
+
+    if(_RXmode == ATB_RX_MODE_NONE) {
+        return 0;
+    } else if(_RXmode == ATB_RX_MODE_FREE) {
+        if(_cbRX == NULL) {
+            return 0;
+        }
+
+        if(BufferAvailable > 0) {
+            uint8_t * b = new uint8_t[BufferAvailable];
+            _RXbuffer->peek((char *) b, BufferAvailable);
+            r = _cbRX(b, BufferAvailable);
+            _RXbuffer->remove(r);
+        }
+
+        if(r == BufferAvailable && buf && (len > 0)) {
+            return _cbRX(buf, len);
+        } else {
+            return 0;
+        }
+
+    } else if(_RXmode == ATB_RX_MODE_READ_BYTES) {
+        if(_rxReadBytesPtr == NULL || _cbDone == NULL) {
+            return 0;
+        }
+
+        size_t newReadCount = 0;
+
+        if(BufferAvailable) {
+            r = _RXbuffer->read((char *) _rxReadBytesPtr, _rxSize);
+            _rxSize -= r;
+            _rxReadBytesPtr += r;
+        }
+
+        if(_RXbuffer->empty() && (len > 0) && buf) {
+            r = len;
+            if(r > _rxSize) {
+                r = _rxSize;
+            }
+            memcpy(_rxReadBytesPtr, buf, r);
+            _rxReadBytesPtr += r;
+            _rxSize -= r;
+            newReadCount += r;
+        }
+
+        if(_rxSize == 0) {
+            _RXmode = ATB_RX_MODE_NONE;
+            _cbDone(true, NULL);
+        }
+
+        // add left over bytes to Buffer
+        return newReadCount;
+
+    } else if(_RXmode == ATB_RX_MODE_TERMINATOR) {
+        // TODO implement read terminator non string
+
+    } else if(_RXmode == ATB_RX_MODE_TERMINATOR_STRING) {
+        if(_rxReadStringPtr == NULL || _cbDone == NULL) {
+            return 0;
+        }
+
+        // handle Buffer
+        if(BufferAvailable > 0) {
+            while(!_RXbuffer->empty()) {
+                char c = _RXbuffer->read();
+                if(c == _rxTerminator || c == 0x00) {
+                    _RXmode = ATB_RX_MODE_NONE;
+                    _cbDone(true, _rxReadStringPtr);
+                    return 0;
+                } else {
+                    (*_rxReadStringPtr) += c;
+                }
+            }
+        }
+
+        if(_RXbuffer->empty() && (len > 0) && buf) {
+            size_t newReadCount = 0;
+            while(newReadCount < len) {
+                char c = (char) *buf;
+                buf++;
+                newReadCount++;
+                if(c == _rxTerminator || c == 0x00) {
+                    _RXmode = ATB_RX_MODE_NONE;
+                    _cbDone(true, _rxReadStringPtr);
+                    return newReadCount;
+                } else {
+                    (*_rxReadStringPtr) += c;
+                }
+            }
+            return newReadCount;
+        }
+    }
+
+    return 0;
+}
diff --git a/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h b/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h
new file mode 100644
index 0000000..374364e
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/ESPAsyncTCPbuffer.h
@@ -0,0 +1,118 @@
+/**
+ * @file ESPAsyncTCPbuffer.h
+ * @date  22.01.2016
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the Asynv TCP for ESP.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef ESPASYNCTCPBUFFER_H_
+#define ESPASYNCTCPBUFFER_H_
+
+//#define DEBUG_ASYNC_TCP(...)  while(((U0S >> USTXC) & 0x7F) != 0x00); os_printf( __VA_ARGS__ ); while(((U0S >> USTXC) & 0x7F) != 0x00)
+
+#ifndef DEBUG_ASYNC_TCP
+#define DEBUG_ASYNC_TCP(...)
+#endif
+
+#include <Arduino.h>
+#include <cbuf.h>
+
+#include "ESPAsyncTCP.h"
+
+
+
+typedef enum {
+    ATB_RX_MODE_NONE,
+    ATB_RX_MODE_FREE,
+    ATB_RX_MODE_READ_BYTES,
+    ATB_RX_MODE_TERMINATOR,
+    ATB_RX_MODE_TERMINATOR_STRING
+} atbRxMode_t;
+
+class AsyncTCPbuffer: public Print {
+
+    public:
+
+        typedef std::function<size_t(uint8_t * payload, size_t length)> AsyncTCPbufferDataCb;
+        typedef std::function<void(bool ok, void * ret)> AsyncTCPbufferDoneCb;
+        typedef std::function<bool(AsyncTCPbuffer * obj)> AsyncTCPbufferDisconnectCb;
+
+        AsyncTCPbuffer(AsyncClient* c);
+        virtual ~AsyncTCPbuffer();
+
+        size_t write(String & data);
+        size_t write(uint8_t data);
+        size_t write(const char* data);
+        size_t write(const char *data, size_t len);
+        size_t write(const uint8_t *data, size_t len);
+
+        void flush();
+
+        void noCallback();
+
+        void readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done);
+
+        // TODO implement read terminator non string
+        //void readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done);
+        //void readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done);
+
+        void readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done);
+        void readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done);
+
+        // TODO implement
+        // void setTimeout(size_t timeout);
+
+        void onData(AsyncTCPbufferDataCb cb);
+        void onDisconnect(AsyncTCPbufferDisconnectCb cb);
+
+        IPAddress remoteIP();
+        uint16_t  remotePort();
+        IPAddress localIP();
+        uint16_t  localPort();
+
+        bool connected();
+
+        void stop();
+        void close();
+
+    protected:
+        AsyncClient* _client;
+        cbuf * _TXbufferRead;
+        cbuf * _TXbufferWrite;
+        cbuf * _RXbuffer;
+        atbRxMode_t _RXmode;
+        size_t _rxSize;
+        char _rxTerminator;
+        uint8_t * _rxReadBytesPtr;
+        String * _rxReadStringPtr;
+
+        AsyncTCPbufferDataCb _cbRX;
+        AsyncTCPbufferDoneCb _cbDone;
+        AsyncTCPbufferDisconnectCb _cbDisconnect;
+
+        void _attachCallbacks();
+        void _sendBuffer();
+        void _on_close();
+        void _rxData(uint8_t *buf, size_t len);
+        size_t _handleRxBuffer(uint8_t *buf, size_t len);
+
+};
+
+#endif /* ESPASYNCTCPBUFFER_H_ */
diff --git a/libraries/ESPAsyncTCP/src/SyncClient.cpp b/libraries/ESPAsyncTCP/src/SyncClient.cpp
new file mode 100644
index 0000000..9bd3c47
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/SyncClient.cpp
@@ -0,0 +1,261 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "SyncClient.h"
+#include "Arduino.h"
+#include "ESPAsyncTCP.h"
+#include "cbuf.h"
+
+
+SyncClient::SyncClient(size_t txBufLen)
+  : _client(NULL)
+  , _tx_buffer(NULL)
+  , _tx_buffer_size(txBufLen)
+  , _rx_buffer(NULL)
+{}
+
+SyncClient::SyncClient(AsyncClient *client, size_t txBufLen)
+  : _client(client)
+  , _tx_buffer(new cbuf(txBufLen))
+  , _tx_buffer_size(txBufLen)
+  , _rx_buffer(NULL)
+{
+  _attachCallbacks();
+}
+
+SyncClient::~SyncClient(){
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  while(_rx_buffer != NULL){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = _rx_buffer->next;
+    delete b;
+  }
+}
+
+int SyncClient::connect(IPAddress ip, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((SyncClient*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(ip, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+int SyncClient::connect(const char *host, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((SyncClient*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(host, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+SyncClient & SyncClient::operator=(const SyncClient &other){
+  if(_client != NULL){
+    _client->abort();
+    _client->free();
+    _client = NULL;
+  }
+  _tx_buffer_size = other._tx_buffer_size;
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  while(_rx_buffer != NULL){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = b->next;
+    delete b;
+  }
+  _tx_buffer = new cbuf(other._tx_buffer_size);
+  _client = other._client;
+  _attachCallbacks();
+  return *this;
+}
+
+void SyncClient::setTimeout(uint32_t seconds){
+  if(_client != NULL)
+    _client->setRxTimeout(seconds);
+}
+
+uint8_t SyncClient::status(){
+  if(_client == NULL)
+    return 0;
+  return _client->state();
+}
+
+uint8_t SyncClient::connected(){
+  return (_client != NULL && _client->connected());
+}
+
+void SyncClient::stop(){
+  if(_client != NULL)
+    _client->close(true);
+}
+
+size_t SyncClient::_sendBuffer(){
+  size_t available = _tx_buffer->available();
+  if(!connected() || !_client->canSend() || available == 0)
+    return 0;
+  size_t sendable = _client->space();
+  if(sendable < available)
+    available= sendable;
+  char *out = new char[available];
+  _tx_buffer->read(out, available);
+  size_t sent = _client->write(out, available);
+  delete[] out;
+  return sent;
+}
+
+void SyncClient::_onData(void *data, size_t len){
+  _client->ackLater();
+  cbuf *b = new cbuf(len+1);
+  if(b != NULL){
+    b->write((const char *)data, len);
+    if(_rx_buffer == NULL)
+      _rx_buffer = b;
+    else {
+      cbuf *p = _rx_buffer;
+      while(p->next != NULL)
+        p = p->next;
+      p->next = b;
+    }
+  }
+}
+
+void SyncClient::_onDisconnect(){
+  if(_client != NULL){
+    _client = NULL;
+  }
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  while(_rx_buffer != NULL){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = b->next;
+    delete b;
+  }
+}
+
+void SyncClient::_onConnect(AsyncClient *c){
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  _tx_buffer = new cbuf(_tx_buffer_size);
+  _attachCallbacks();
+}
+
+void SyncClient::_attachCallbacks(){
+  _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time){ ((SyncClient*)(obj))->_sendBuffer(); }, this);
+  _client->onDisconnect([](void *obj, AsyncClient* c){ ((SyncClient*)(obj))->_onDisconnect(); delete c; }, this);
+  _client->onData([](void *obj, AsyncClient* c, void *data, size_t len){ ((SyncClient*)(obj))->_onData(data, len); }, this);
+  _client->onTimeout([](void *obj, AsyncClient* c, uint32_t time){ c->close(); }, this);
+}
+
+size_t SyncClient::write(uint8_t data){
+  return write(&data, 1);
+}
+
+size_t SyncClient::write(const uint8_t *data, size_t len){
+  if(_tx_buffer == NULL || !connected()){
+    return 0;
+  }
+  size_t toWrite = 0;
+  size_t toSend = len;
+  while(_tx_buffer->room() < toSend){
+    toWrite = _tx_buffer->room();
+    _tx_buffer->write((const char*)data, toWrite);
+    while(!_client->canSend() && connected())
+      delay(0);
+    _sendBuffer();
+    toSend -= toWrite;
+  }
+  _tx_buffer->write((const char*)(data+(len - toSend)), toSend);
+  if(_client->canSend() && connected())
+    _sendBuffer();
+  return len;
+}
+
+int SyncClient::available(){
+  if(_rx_buffer == NULL) return 0;
+  size_t a = 0;
+  cbuf *b = _rx_buffer;
+  while(b != NULL){
+    a += b->available();
+    b = b->next;
+  }
+  return a;
+}
+
+int SyncClient::peek(){
+  if(_rx_buffer == NULL) return -1;
+  return _rx_buffer->peek();
+}
+
+int SyncClient::read(uint8_t *data, size_t len){
+  if(_rx_buffer == NULL) return -1;
+
+  size_t readSoFar = 0;
+  while(_rx_buffer != NULL && (len - readSoFar) >= _rx_buffer->available()){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = _rx_buffer->next;
+    size_t toRead = b->available();
+    readSoFar += b->read((char*)(data+readSoFar), toRead);
+    _client->ack(b->size() - 1);
+    delete b;
+  }
+  if(_rx_buffer != NULL && readSoFar < len){
+    readSoFar += _rx_buffer->read((char*)(data+readSoFar), (len - readSoFar));
+  }
+  return readSoFar;
+}
+
+int SyncClient::read(){
+  uint8_t res = 0;
+  if(read(&res, 1) != 1)
+    return -1;
+  return res;
+}
+
+void SyncClient::flush(){
+  if(_tx_buffer == NULL || !connected())
+    return;
+  if(_tx_buffer->available()){
+    while(!_client->canSend() && connected())
+      delay(0);
+    _sendBuffer();
+  }
+}
diff --git a/libraries/ESPAsyncTCP/src/SyncClient.h b/libraries/ESPAsyncTCP/src/SyncClient.h
new file mode 100644
index 0000000..7f1c4ee
--- /dev/null
+++ b/libraries/ESPAsyncTCP/src/SyncClient.h
@@ -0,0 +1,68 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef SYNCCLIENT_H_
+#define SYNCCLIENT_H_
+
+#include "Client.h"
+class cbuf;
+class AsyncClient;
+
+class SyncClient: public Client {
+  private:
+    AsyncClient *_client;
+    cbuf *_tx_buffer;
+    size_t _tx_buffer_size;
+    cbuf *_rx_buffer;
+
+    size_t _sendBuffer();
+    void _onData(void *data, size_t len);
+    void _onConnect(AsyncClient *c);
+    void _onDisconnect();
+    void _attachCallbacks();
+
+  public:
+    SyncClient(size_t txBufLen = 1460);
+    SyncClient(AsyncClient *client, size_t txBufLen = 1460);
+    virtual ~SyncClient();
+
+    operator bool(){ return connected(); }
+    SyncClient & operator=(const SyncClient &other);
+
+    int connect(IPAddress ip, uint16_t port);
+    int connect(const char *host, uint16_t port);
+    void setTimeout(uint32_t seconds);
+
+    uint8_t status();
+    uint8_t connected();
+    void stop();
+
+    size_t write(uint8_t data);
+    size_t write(const uint8_t *data, size_t len);
+
+    int available();
+    int peek();
+    int read();
+    int read(uint8_t *data, size_t len);
+    void flush();
+};
+
+#endif /* SYNCCLIENT_H_ */
diff --git a/libraries/ESPAsyncTCP/travis/common.sh b/libraries/ESPAsyncTCP/travis/common.sh
new file mode 100644
index 0000000..57bede3
--- /dev/null
+++ b/libraries/ESPAsyncTCP/travis/common.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+function build_sketches()
+{
+    local arduino=$1
+    local srcpath=$2
+    local platform=$3
+    local sketches=$(find $srcpath -name *.ino)
+    for sketch in $sketches; do
+        local sketchdir=$(dirname $sketch)
+        if [[ -f "$sketchdir/.$platform.skip" ]]; then
+            echo -e "\n\n ------------ Skipping $sketch ------------ \n\n";
+            continue
+        fi
+        echo -e "\n\n ------------ Building $sketch ------------ \n\n";
+        $arduino --verify $sketch;
+        local result=$?
+        if [ $result -ne 0 ]; then
+            echo "Build failed ($1)"
+            return $result
+        fi
+    done
+}
diff --git a/libraries/ESPAsyncWebServer-master/.travis.yml b/libraries/ESPAsyncWebServer-master/.travis.yml
new file mode 100644
index 0000000..b4afa8e
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/.travis.yml
@@ -0,0 +1,51 @@
+sudo: false
+language: bash
+os:
+  - linux
+
+script:
+  - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
+  - sleep 3
+  - export DISPLAY=:1.0
+  - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz
+  - tar xf arduino-1.6.5-linux64.tar.xz
+  - mv arduino-1.6.5 $HOME/arduino_ide
+  - export PATH="$HOME/arduino_ide:$PATH"
+  - which arduino
+  - mkdir -p $HOME/Arduino/libraries
+  - cp -r $TRAVIS_BUILD_DIR $HOME/Arduino/libraries/ESPAsyncWebServer
+  - git clone https://github.com/bblanchon/ArduinoJson $HOME/Arduino/libraries/ArduinoJson
+  - git clone https://github.com/me-no-dev/ESPAsyncTCP $HOME/Arduino/libraries/ESPAsyncTCP
+  - cd $HOME/arduino_ide/hardware
+  - mkdir esp8266com
+  - cd esp8266com
+  - git clone https://github.com/esp8266/Arduino.git esp8266
+  - cd esp8266/tools
+  - python get.py
+  - cd $HOME/arduino_ide/hardware
+  - mkdir espressif
+  - cd espressif
+  - git clone https://github.com/me-no-dev/ESP31B.git ESP31B
+  - cd ESP31B/tools
+  - wget https://github.com/me-no-dev/ESP31B/releases/download/0.0.1/xtensa-esp108-elf-linux64.tar.gz
+  - tar zxvf xtensa-esp108-elf-linux64.tar.gz
+  - chmod +x xtensa-esp108-elf/bin/*
+  - chmod +x xtensa-esp108-elf/xtensa-esp108-elf/bin/*
+  - source $TRAVIS_BUILD_DIR/travis/common.sh
+  - arduino --board esp8266com:esp8266:generic --save-prefs
+  - arduino --get-pref sketchbook.path
+  - build_sketches arduino $HOME/Arduino/libraries/ESPAsyncWebServer esp8266
+#  - arduino --board espressif:ESP31B:esp31b --save-prefs
+#  - arduino --get-pref sketchbook.path
+#  - build_sketches arduino $HOME/Arduino/libraries/ESPAsyncWebServer esp31b
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/60e65d0c78ea0a920347
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false
diff --git a/libraries/ESPAsyncWebServer-master/README.md b/libraries/ESPAsyncWebServer-master/README.md
new file mode 100644
index 0000000..f9123bd
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/README.md
@@ -0,0 +1,937 @@
+# ESPAsyncWebServer [![Build Status](https://travis-ci.org/me-no-dev/ESPAsyncWebServer.svg?branch=master)](https://travis-ci.org/me-no-dev/ESPAsyncWebServer)
+
+For help and support [![Join the chat at https://gitter.im/me-no-dev/ESPAsyncWebServer](https://badges.gitter.im/me-no-dev/ESPAsyncWebServer.svg)](https://gitter.im/me-no-dev/ESPAsyncWebServer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+Async HTTP and WebSocket Server for ESP8266 and ESP31B Arduino
+
+Requires [ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP) to work
+
+To use this library you need to have the latest git versions of either [ESP8266](https://github.com/esp8266/Arduino) or [ESP31B](https://github.com/me-no-dev/ESP31B) Arduino Core
+
+## Why should you care
+- Using asynchronous network means that you can handle more than one connection at the same time
+- You are called once the request is ready and parsed
+- When you send the response, you are immediately ready to handle other connections
+  while the server is taking care of sending the response in the background
+- Speed is OMG
+- Easy to use API, HTTP Basic and Digest MD5 Authentication (default), ChunkedResponse
+- Easily extendible to handle any type of content
+- Supports Continue 100
+- Async WebSocket plugin offering different locations without extra servers or ports
+- Async EventSource (Server-Sent Events) plugin to send events to the browser
+- URL Rewrite plugin for conditional and permanent url rewrites
+- ServeStatic plugin that supports cache, Last-Modified, default index and more
+
+## Important things to remember
+- This is fully asynchronous server and as such does not run on the loop thread.
+- You can not use yield or delay or any function that uses them inside the callbacks
+- The server is smart enough to know when to close the connection and free resources
+- You can not send more than one response to a single request
+
+## Principles of operation
+
+### The Async Web server
+- Listens for connections
+- Wraps the new clients into ```Request```
+- Keeps track of clients and cleans memory
+- Manages ```Rewrites``` and apply them on the request url
+- Manages ```Handlers``` and attaches them to Requests
+
+### Request Life Cycle
+- TCP connection is received by the server
+- The connection is wrapped inside ```Request``` object
+- When the request head is received (type, url, get params, http version and host),
+  the server goes through all ```Rewrites``` (in the order they were added) to rewrite the url and inject query parameters,
+  next, it goes through all attached ```Handlers```(in the order they were added) trying to find one
+  that ```canHandle``` the given request. If none are found, the default(catch-all) handler is attached.
+- The rest of the request is received, calling the ```handleUpload``` or ```handleBody``` methods of the ```Handler``` if they are needed (POST+File/Body)
+- When the whole request is parsed, the result is given to the ```handleRequest``` method of the ```Handler``` and is ready to be responded to
+- In the ```handleRequest``` method, to the ```Request``` is attached a ```Response``` object (see below) that will serve the response data back to the client
+- When the ```Response``` is sent, the client is closed and freed from the memory
+
+### Rewrites and how do they work
+- The ```Rewrites``` are used to rewrite the request url and/or inject get parameters for a specific request url path.
+- All ```Rewrites``` are evaluated on the request in the order they have been added to the server.
+- The ```Rewrite``` will change the request url only if the request url (excluding get parameters) is fully match
+  the rewrite url, and when the optional ```Filter``` callback return true.
+- Setting a ```Filter``` to the ```Rewrite``` enables to control when to apply the rewrite, decision can be based on
+  request url, http version, request host/port/target host, get parameters or the request client's localIP or remoteIP.
+- Two filter callbacks are provided: ```ON_AP_FILTER``` to execute the rewrite when request is made to the AP interface,
+  ```ON_STA_FILTER``` to execute the rewrite when request is made to the STA interface.
+- The ```Rewrite``` can specify a target url with optional get parameters, e.g. ```/to-url?with=params```
+
+### Handlers and how do they work
+- The ```Handlers``` are used for executing specific actions to particular requests
+- One ```Handler``` instance can be attached to any request and lives together with the server
+- Setting a ```Filter``` to the ```Handler``` enables to control when to apply the handler, decision can be based on
+  request url, http version, request host/port/target host, get parameters or the request client's localIP or remoteIP.
+- Two filter callbacks are provided: ```ON_AP_FILTER``` to execute the rewrite when request is made to the AP interface,
+  ```ON_STA_FILTER``` to execute the rewrite when request is made to the STA interface.
+- The ```canHandle``` method is used for handler specific control on whether the requests can be handled
+  and for declaring any interesting headers that the ```Request``` should parse. Decision can be based on request
+  method, request url, http version, request host/port/target host and get parameters
+- Once a ```Handler``` is attached to given ```Request``` (```canHandle``` returned true)
+  that ```Handler``` takes care to receive any file/data upload and attach a ```Response```
+  once the ```Request``` has been fully parsed
+- ```Handlers``` are evaluated in the order they are attached to the server. The ```canHandle``` is called only
+  if the ```Filter``` that was set to the ```Handler``` return true.
+- The first ```Handler``` that can handle the request is selected, not further ```Filter``` and ```canHandle``` are called.
+
+### Responses and how do they work
+- The ```Response``` objects are used to send the response data back to the client
+- The ```Response``` object lives with the ```Request``` and is freed on end or disconnect
+- Different techniques are used depending on the response type to send the data in packets
+  returning back almost immediately and sending the next packet when this one is received.
+  Any time in between is spent to run the user loop and handle other network packets
+- Responding asynchronously is probably the most difficult thing for most to understand
+- Many different options exist for the user to make responding a background task
+
+## Libraries and projects that use AsyncWebServer
+- [WebSocketToSerial](https://github.com/hallard/WebSocketToSerial) - Debug serial devices through the web browser
+- [Sattrack](https://github.com/Hopperpop/Sattrack) - Track the ISS with ESP8266
+- [ESP Radio](https://github.com/Edzelf/Esp-radio) - Icecast radio based on ESP8266 and VS1053
+- [VZero](https://github.com/andig/vzero) - the Wireless zero-config controller for volkszaehler.org
+
+## Request Variables
+
+### Common Variables
+```cpp
+request->version();       // uint8_t: 0 = HTTP/1.0, 1 = HTTP/1.1
+request->method();        // enum:    HTTP_GET, HTTP_POST, HTTP_DELETE, HTTP_PUT, HTTP_PATCH, HTTP_HEAD, HTTP_OPTIONS
+request->url();           // String:  URL of the request (not including host, port or GET parameters)
+request->host();          // String:  The requested host (can be used for virtual hosting)
+request->contentType();   // String:  ContentType of the request (not avaiable in Handler::canHandle)
+request->contentLength(); // size_t:  ContentLength of the request (not avaiable in Handler::canHandle)
+request->multipart();     // bool:    True if the request has content type "multipart"
+```
+
+### Headers
+```cpp
+//List all collected headers
+int headers = request->headers();
+int i;
+for(i=0;i<headers;i++){
+  AsyncWebHeader* h = request->getHeader(i);
+  Serial.printf("HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str());
+}
+
+//get specific header by name
+if(request->hasHeader("MyHeader")){
+  AsyncWebHeader* h = request->getHeader("MyHeader");
+  Serial.printf("MyHeader: %s\n", h->value().c_str());
+}
+
+//List all collected headers (Compatibility)
+int headers = request->headers();
+int i;
+for(i=0;i<headers;i++){
+  Serial.printf("HEADER[%s]: %s\n", request->headerName(i).c_str(), request->header(i).c_str());
+}
+
+//get specific header by name (Compatibility)
+if(request->hasHeader("MyHeader")){
+  Serial.printf("MyHeader: %s\n", request->header("MyHeader").c_str());
+}
+```
+
+### GET, POST and FILE parameters
+```cpp
+//List all parameters
+int params = request->params();
+for(int i=0;i<params;i++){
+  AsyncWebParameter* p = request->getParam(i);
+  if(p->isFile()){ //p->isPost() is also true
+    Serial.printf("FILE[%s]: %s, size: %u\n", p->name().c_str(), p->value().c_str(), p->size());
+  } else if(p->isPost()){
+    Serial.printf("POST[%s]: %s\n", p->name().c_str(), p->value().c_str());
+  } else {
+    Serial.printf("GET[%s]: %s\n", p->name().c_str(), p->value().c_str());
+  }
+}
+
+//Check if GET parameter exists
+if(request->hasParam("download"))
+  AsyncWebParameter* p = request->getParam("download");
+
+//Check if POST (but not File) parameter exists
+if(request->hasParam("download", true))
+  AsyncWebParameter* p = request->getParam("download", true);
+
+//Check if FILE was uploaded
+if(request->hasParam("download", true, true))
+  AsyncWebParameter* p = request->getParam("download", true, true);
+
+//List all parameters (Compatibility)
+int args = request->args();
+for(int i=0;i<args;i++){
+  Serial.printf("ARG[%s]: %s\n", request->argName(i).c_str(), request->arg(i).c_str());
+}
+
+//Check if parameter exists (Compatibility)
+if(request->hasArg("download"))
+  String arg = request->arg("download");
+```
+
+### FILE Upload handling
+```cpp
+void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+  if(!index){
+    Serial.printf("UploadStart: %s\n", filename.c_str());
+  }
+  for(size_t i=0; i<len; i++){
+    Serial.write(data[i]);
+  }
+  if(final){
+    Serial.printf("UploadEnd: %s, %u B\n", filename.c_str(), index+len);
+  }
+}
+```
+
+### Body data handling
+```cpp
+void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
+  if(!index){
+    Serial.printf("BodyStart: %u B\n", total);
+  }
+  for(size_t i=0; i<len; i++){
+    Serial.write(data[i]);
+  }
+  if(index + len == total){
+    Serial.printf("BodyEnd: %u B\n", total);
+  }
+}
+```
+
+## Responses
+### Redirect to another URL
+```cpp
+//to local url
+request->redirect("/login");
+
+//to external url
+request->redirect("http://esp8266.com");
+```
+
+### Basic response with HTTP Code
+```cpp
+request->send(404); //Sends 404 File Not Found
+```
+
+### Basic response with HTTP Code and extra headers
+```cpp
+AsyncWebServerResponse *response = request->beginResponse(404); //Sends 404 File Not Found
+response->addHeader("Server","ESP Async Web Server");
+request->send(response);
+```
+
+### Basic response with string content
+```cpp
+request->send(200, "text/plain", "Hello World!");
+```
+
+### Basic response with string content and extra headers
+```cpp
+AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", "Hello World!");
+response->addHeader("Server","ESP Async Web Server");
+request->send(response);
+```
+
+### Send large webpage from PROGMEM
+```cpp
+const char index_html[] PROGMEM = "..."; // large char array, tested with 14k
+request->send_P(200, "text/html", index_html);
+```
+
+### Send large webpage from PROGMEM and extra headers
+```cpp
+const char index_html[] PROGMEM = "..."; // large char array, tested with 14k
+AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", index_html);
+response->addHeader("Server","ESP Async Web Server");
+request->send(response);
+```
+
+### Send binary content from PROGMEM
+```cpp
+
+//File: favicon.ico.gz, Size: 726
+#define favicon_ico_gz_len 726
+const uint8_t favicon_ico_gz[] PROGMEM = {
+ 0x1F, 0x8B, 0x08, 0x08, 0x0B, 0x87, 0x90, 0x57, 0x00, 0x03, 0x66, 0x61, 0x76, 0x69, 0x63, 0x6F,
+ 0x6E, 0x2E, 0x69, 0x63, 0x6F, 0x00, 0xCD, 0x53, 0x5F, 0x48, 0x9A, 0x51, 0x14, 0xBF, 0x62, 0x6D,
+ 0x86, 0x96, 0xA9, 0x64, 0xD3, 0xFE, 0xA8, 0x99, 0x65, 0x1A, 0xB4, 0x8A, 0xA8, 0x51, 0x54, 0x23,
+ 0xA8, 0x11, 0x49, 0x51, 0x8A, 0x34, 0x62, 0x93, 0x85, 0x31, 0x58, 0x44, 0x12, 0x45, 0x2D, 0x58,
+ 0xF5, 0x52, 0x41, 0x10, 0x23, 0x82, 0xA0, 0x20, 0x98, 0x2F, 0xC1, 0x26, 0xED, 0xA1, 0x20, 0x89,
+ 0x04, 0xD7, 0x83, 0x58, 0x20, 0x28, 0x04, 0xAB, 0xD1, 0x9B, 0x8C, 0xE5, 0xC3, 0x60, 0x32, 0x64,
+ 0x0E, 0x56, 0xBF, 0x9D, 0xEF, 0xF6, 0x30, 0x82, 0xED, 0xAD, 0x87, 0xDD, 0x8F, 0xF3, 0xDD, 0x8F,
+ 0x73, 0xCF, 0xEF, 0x9C, 0xDF, 0x39, 0xBF, 0xFB, 0x31, 0x26, 0xA2, 0x27, 0x37, 0x97, 0xD1, 0x5B,
+ 0xCF, 0x9E, 0x67, 0x30, 0xA6, 0x66, 0x8C, 0x99, 0xC9, 0xC8, 0x45, 0x9E, 0x6B, 0x3F, 0x5F, 0x74,
+ 0xA6, 0x94, 0x5E, 0xDB, 0xFF, 0xB2, 0xE6, 0xE7, 0xE7, 0xF9, 0xDE, 0xD6, 0xD6, 0x96, 0xDB, 0xD8,
+ 0xD8, 0x78, 0xBF, 0xA1, 0xA1, 0xC1, 0xDA, 0xDC, 0xDC, 0x2C, 0xEB, 0xED, 0xED, 0x15, 0x9B, 0xCD,
+ 0xE6, 0x4A, 0x83, 0xC1, 0xE0, 0x2E, 0x29, 0x29, 0x99, 0xD6, 0x6A, 0xB5, 0x4F, 0x75, 0x3A, 0x9D,
+ 0x61, 0x75, 0x75, 0x95, 0xB5, 0xB7, 0xB7, 0xDF, 0xC8, 0xD1, 0xD4, 0xD4, 0xF4, 0xB0, 0xBA, 0xBA,
+ 0xFA, 0x83, 0xD5, 0x6A, 0xFD, 0x5A, 0x5E, 0x5E, 0x9E, 0x28, 0x2D, 0x2D, 0x0D, 0x10, 0xC6, 0x4B,
+ 0x98, 0x78, 0x5E, 0x5E, 0xDE, 0x95, 0x42, 0xA1, 0x40, 0x4E, 0x4E, 0xCE, 0x65, 0x76, 0x76, 0xF6,
+ 0x47, 0xB5, 0x5A, 0x6D, 0x4F, 0x26, 0x93, 0xA2, 0xD6, 0xD6, 0x56, 0x8E, 0x6D, 0x69, 0x69, 0xD1,
+ 0x11, 0x36, 0x62, 0xB1, 0x58, 0x60, 0x32, 0x99, 0xA0, 0xD7, 0xEB, 0x51, 0x58, 0x58, 0x88, 0xFC,
+ 0xFC, 0x7C, 0x10, 0x16, 0x02, 0x56, 0x2E, 0x97, 0x43, 0x2A, 0x95, 0x42, 0x2C, 0x16, 0x23, 0x33,
+ 0x33, 0x33, 0xAE, 0x52, 0xA9, 0x1E, 0x64, 0x65, 0x65, 0x71, 0x7C, 0x7D, 0x7D, 0xBD, 0x93, 0xEA,
+ 0xFE, 0x30, 0x1A, 0x8D, 0xE8, 0xEC, 0xEC, 0xC4, 0xE2, 0xE2, 0x22, 0x6A, 0x6A, 0x6A, 0x40, 0x39,
+ 0x41, 0xB5, 0x38, 0x4E, 0xC8, 0x33, 0x3C, 0x3C, 0x0C, 0x87, 0xC3, 0xC1, 0x6B, 0x54, 0x54, 0x54,
+ 0xBC, 0xE9, 0xEB, 0xEB, 0x93, 0x5F, 0x5C, 0x5C, 0x30, 0x8A, 0x9D, 0x2E, 0x2B, 0x2B, 0xBB, 0xA2,
+ 0x3E, 0x41, 0xBD, 0x21, 0x1E, 0x8F, 0x63, 0x6A, 0x6A, 0x0A, 0x81, 0x40, 0x00, 0x94, 0x1B, 0x3D,
+ 0x3D, 0x3D, 0x42, 0x3C, 0x96, 0x96, 0x96, 0x70, 0x7E, 0x7E, 0x8E, 0xE3, 0xE3, 0x63, 0xF8, 0xFD,
+ 0xFE, 0xB4, 0xD7, 0xEB, 0xF5, 0x8F, 0x8F, 0x8F, 0x5B, 0x68, 0x5E, 0x6F, 0x05, 0xCE, 0xB4, 0xE3,
+ 0xE8, 0xE8, 0x08, 0x27, 0x27, 0x27, 0xD8, 0xDF, 0xDF, 0xC7, 0xD9, 0xD9, 0x19, 0x6C, 0x36, 0x1B,
+ 0x36, 0x36, 0x36, 0x38, 0x9F, 0x85, 0x85, 0x05, 0xAC, 0xAF, 0xAF, 0x23, 0x1A, 0x8D, 0x22, 0x91,
+ 0x48, 0x20, 0x16, 0x8B, 0xFD, 0xDA, 0xDA, 0xDA, 0x7A, 0x41, 0x33, 0x7E, 0x57, 0x50, 0x50, 0x80,
+ 0x89, 0x89, 0x09, 0x84, 0xC3, 0x61, 0x6C, 0x6F, 0x6F, 0x23, 0x12, 0x89, 0xE0, 0xE0, 0xE0, 0x00,
+ 0x43, 0x43, 0x43, 0x58, 0x5E, 0x5E, 0xE6, 0x9C, 0x7D, 0x3E, 0x1F, 0x46, 0x47, 0x47, 0x79, 0xBE,
+ 0xBD, 0xBD, 0x3D, 0xE1, 0x3C, 0x1D, 0x0C, 0x06, 0x9F, 0x10, 0xB7, 0xC7, 0x84, 0x4F, 0xF6, 0xF7,
+ 0xF7, 0x63, 0x60, 0x60, 0x00, 0x83, 0x83, 0x83, 0x18, 0x19, 0x19, 0xC1, 0xDC, 0xDC, 0x1C, 0x8F,
+ 0x17, 0x7C, 0xA4, 0x27, 0xE7, 0x34, 0x39, 0x39, 0x89, 0x9D, 0x9D, 0x1D, 0x6E, 0x54, 0xE3, 0x13,
+ 0xE5, 0x34, 0x11, 0x37, 0x49, 0x51, 0x51, 0xD1, 0x4B, 0xA5, 0x52, 0xF9, 0x45, 0x26, 0x93, 0x5D,
+ 0x0A, 0xF3, 0x92, 0x48, 0x24, 0xA0, 0x6F, 0x14, 0x17, 0x17, 0xA3, 0xB6, 0xB6, 0x16, 0x5D, 0x5D,
+ 0x5D, 0x7C, 0x1E, 0xBB, 0xBB, 0xBB, 0x9C, 0xD7, 0xE1, 0xE1, 0x21, 0x42, 0xA1, 0xD0, 0x6B, 0xD2,
+ 0x45, 0x4C, 0x33, 0x12, 0x34, 0xCC, 0xA0, 0x19, 0x54, 0x92, 0x56, 0x0E, 0xD2, 0xD9, 0x43, 0xF8,
+ 0xCF, 0x82, 0x56, 0xC2, 0xDC, 0xEB, 0xEA, 0xEA, 0x38, 0x7E, 0x6C, 0x6C, 0x4C, 0xE0, 0xFE, 0x9D,
+ 0xB8, 0xBF, 0xA7, 0xFA, 0xAF, 0x56, 0x56, 0x56, 0xEE, 0x6D, 0x6E, 0x6E, 0xDE, 0xB8, 0x47, 0x55,
+ 0x55, 0x55, 0x6C, 0x66, 0x66, 0x46, 0x44, 0xDA, 0x3B, 0x34, 0x1A, 0x4D, 0x94, 0xB0, 0x3F, 0x09,
+ 0x7B, 0x45, 0xBD, 0xA5, 0x5D, 0x2E, 0x57, 0x8C, 0x7A, 0x73, 0xD9, 0xED, 0xF6, 0x3B, 0x84, 0xFF,
+ 0xE7, 0x7D, 0xA6, 0x3A, 0x2C, 0x95, 0x4A, 0xB1, 0x8E, 0x8E, 0x0E, 0x6D, 0x77, 0x77, 0xB7, 0xCD,
+ 0xE9, 0x74, 0x3E, 0x73, 0xBB, 0xDD, 0x8F, 0x3C, 0x1E, 0x8F, 0xE6, 0xF4, 0xF4, 0x94, 0xAD, 0xAD,
+ 0xAD, 0xDD, 0xDE, 0xCF, 0x73, 0x0B, 0x0B, 0xB8, 0xB6, 0xE0, 0x5D, 0xC6, 0x66, 0xC5, 0xE4, 0x10,
+ 0x4C, 0xF4, 0xF7, 0xD8, 0x59, 0xF2, 0x7F, 0xA3, 0xB8, 0xB4, 0xFC, 0x0F, 0xEE, 0x37, 0x70, 0xEC,
+ 0x16, 0x4A, 0x7E, 0x04, 0x00, 0x00
+};
+
+AsyncWebServerResponse *response = request->beginResponse_P(200, "image/x-icon", favicon_ico_gz, favicon_ico_gz_len);
+response->addHeader("Content-Encoding", "gzip");
+request->send(response);
+```
+
+### Respond with content coming from a Stream
+```cpp
+//read 12 bytes from Serial and send them as Content Type text/plain
+request->send(Serial, "text/plain", 12);
+```
+
+### Respond with content coming from a Stream and extra headers
+```cpp
+//read 12 bytes from Serial and send them as Content Type text/plain
+AsyncWebServerResponse *response = request->beginResponse(Serial, "text/plain", 12);
+response->addHeader("Server","ESP Async Web Server");
+request->send(response);
+```
+
+### Respond with content coming from a File
+```cpp
+//Send index.htm with default content type
+request->send(SPIFFS, "/index.htm");
+
+//Send index.htm as text
+request->send(SPIFFS, "/index.htm", "text/plain");
+
+//Download index.htm
+request->send(SPIFFS, "/index.htm", String(), true);
+```
+
+### Respond with content coming from a File and extra headers
+```cpp
+//Send index.htm with default content type
+AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.htm");
+
+//Send index.htm as text
+AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.htm", "text/plain");
+
+//Download index.htm
+AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/index.htm", String(), true);
+
+response->addHeader("Server","ESP Async Web Server");
+request->send(response);
+```
+
+### Respond with content using a callback
+```cpp
+//send 128 bytes as plain text
+request->send("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+  //Write up to "maxLen" bytes into "buffer" and return the amount written.
+  //index equals the amount of bytes that have been already sent
+  //You will not be asked for more bytes once the content length has been reached.
+  //Keep in mind that you can not delay or yield waiting for more data!
+  //Send what you currently have and you will be asked for more again
+  return mySource.read(buffer, maxLen);
+});
+```
+
+### Respond with content using a callback and extra headers
+```cpp
+//send 128 bytes as plain text
+AsyncWebServerResponse *response = request->beginResponse("text/plain", 128, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+  //Write up to "maxLen" bytes into "buffer" and return the amount written.
+  //index equals the amount of bytes that have been already sent
+  //You will not be asked for more bytes once the content length has been reached.
+  //Keep in mind that you can not delay or yield waiting for more data!
+  //Send what you currently have and you will be asked for more again
+  return mySource.read(buffer, maxLen);
+});
+response->addHeader("Server","ESP Async Web Server");
+request->send(response);
+```
+
+### Chunked Response
+Used when content length is unknown. Works best if the client supports HTTP/1.1
+```cpp
+AsyncWebServerResponse *response = request->beginChunkedResponse("text/plain", [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+  //Write up to "maxLen" bytes into "buffer" and return the amount written.
+  //index equals the amount of bytes that have been already sent
+  //You will be asked for more data until 0 is returned
+  //Keep in mind that you can not delay or yield waiting for more data!
+  return mySource.read(buffer, maxLen);
+});
+response->addHeader("Server","ESP Async Web Server");
+request->send(response);
+```
+
+### Print to response
+```cpp
+AsyncResponseStream *response = request->beginResponseStream("text/html");
+response->addHeader("Server","ESP Async Web Server");
+response->printf("<!DOCTYPE html><html><head><title>Webpage at %s</title></head><body>", request->url().c_str());
+
+response->print("<h2>Hello ");
+response->print(request->client()->remoteIP());
+response->print("</h2>");
+
+response->print("<h3>General</h3>");
+response->print("<ul>");
+response->printf("<li>Version: HTTP/1.%u</li>", request->version());
+response->printf("<li>Method: %s</li>", request->methodToString());
+response->printf("<li>URL: %s</li>", request->url().c_str());
+response->printf("<li>Host: %s</li>", request->host().c_str());
+response->printf("<li>ContentType: %s</li>", request->contentType().c_str());
+response->printf("<li>ContentLength: %u</li>", request->contentLength());
+response->printf("<li>Multipart: %s</li>", request->multipart()?"true":"false");
+response->print("</ul>");
+
+response->print("<h3>Headers</h3>");
+response->print("<ul>");
+int headers = request->headers();
+for(int i=0;i<headers;i++){
+  AsyncWebHeader* h = request->getHeader(i);
+  response->printf("<li>%s: %s</li>", h->name().c_str(), h->value().c_str());
+}
+response->print("</ul>");
+
+response->print("<h3>Parameters</h3>");
+response->print("<ul>");
+int params = request->params();
+for(int i=0;i<params;i++){
+  AsyncWebParameter* p = request->getParam(i);
+  if(p->isFile()){
+    response->printf("<li>FILE[%s]: %s, size: %u</li>", p->name().c_str(), p->value().c_str(), p->size());
+  } else if(p->isPost()){
+    response->printf("<li>POST[%s]: %s</li>", p->name().c_str(), p->value().c_str());
+  } else {
+    response->printf("<li>GET[%s]: %s</li>", p->name().c_str(), p->value().c_str());
+  }
+}
+response->print("</ul>");
+
+response->print("</body></html>");
+//send the response last
+request->send(response);
+```
+
+### ArduinoJson Basic Response
+This way of sending Json is great for when the result is below 4KB
+```cpp
+#include "AsyncJson.h"
+#include "ArduinoJson.h"
+
+
+AsyncResponseStream *response = request->beginResponseStream("text/json");
+DynamicJsonBuffer jsonBuffer;
+JsonObject &root = jsonBuffer.createObject();
+root["heap"] = ESP.getFreeHeap();
+root["ssid"] = WiFi.SSID();
+root.printTo(*response);
+request->send(response);
+```
+
+### ArduinoJson Advanced Response
+This response can handle really large Json objects (tested to 40KB)
+There isn't any noticeable speed decrease for small results with the method above
+Since ArduinoJson does not allow reading parts of the string, the whole Json has to
+be passed every time a chunks needs to be sent, which shows speed decrease proportional
+to the resulting json packets
+```cpp
+#include "AsyncJson.h"
+#include "ArduinoJson.h"
+
+
+AsyncJsonResponse * response = new AsyncJsonResponse();
+response->addHeader("Server","ESP Async Web Server");
+JsonObject& root = response->getRoot();
+root["heap"] = ESP.getFreeHeap();
+root["ssid"] = WiFi.SSID();
+response->setLength();
+request->send(response);
+```
+
+## Serving static files
+In addition to serving files from SPIFFS as described above, the server provide a dedicated handler that optimize the
+performance of serving files from SPIFFS - ```AsyncStaticWebHandler```. Use ```server.serveStatic()``` function to
+initialize and add a new instance of ```AsyncStaticWebHandler``` to the server.
+The Handler will not handle the request if the file does not exists, e.g. the server will continue to look for another
+handler that can handle the request.
+Notice that you can chain setter functions to setup the handler, or keep a pointer to change it at a later time.
+
+### Serving specific file by name
+```cpp
+// Serve the file "/www/page.htm" when request url is "/page.htm"
+server.serveStatic("/page.htm", SPIFFS, "/www/page.htm");
+```
+
+### Serving files in directory
+To serve files in a directory, the path to the files should specify a directory in SPIFFS and ends with "/".
+```cpp
+// Serve files in directory "/www/" when request url starts with "/"
+// Request to the root or none existing files will try to server the defualt
+// file name "index.htm" if exists
+server.serveStatic("/", SPIFFS, "/www/");
+
+// Server with different default file
+server.serveStatic("/", SPIFFS, "/www/").setDefaultFile("default.html");
+```
+
+### Specifying Cache-Control header
+It is possible to specify Cache-Control header value to reduce the number of calls to the server once the client loaded
+the files. For more information on Cache-Control values see [Cache-Control](https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9)
+```cpp
+// Cache responses for 10 minutes (600 seconds)
+server.serveStatic("/", SPIFFS, "/www/").setCacheControl("max-age:600");
+
+//*** Change Cache-Control after server setup ***
+
+// During setup - keep a pointer to the handler
+AsyncStaticWebHandler* handler = &server.serveStatic("/", SPIFFS, "/www/").setCacheControl("max-age:600");
+
+// At a later event - change Cache-Control
+handler->setCacheControl("max-age:30");
+```
+
+### Specifying Date-Modified header
+It is possible to specify Date-Modified header to enable the server to return Not-Modified (304) response for requests
+with "If-Modified-Since" header with the same value, instead of responding with the actual file content.
+```cpp
+// Update the date modified string every time files are updated
+server.serveStatic("/", SPIFFS, "/www/").setLastModified("Mon, 20 Jun 2016 14:00:00 GMT");
+
+//*** Chage last modified value at a later stage ***
+
+// During setup - read last modified value from config or EEPROM
+String date_modified = loadDateModified();
+AsyncStaticWebHandler* handler = &server.serveStatic("/", SPIFFS, "/www/");
+handler->setLastModified(date_modified);
+
+// At a later event when files are updated
+String date_modified = getNewDateModfied();
+saveDateModified(date_modified); // Save for next reset
+handler->setLastModified(date_modified);
+```
+
+## Using filters
+Filters can be set to `Rewrite` or `Handler` in order to control when to apply the rewrite and consider the handler.
+A filter is a callback function that evaluates the request and return a boolean `true` to include the item
+or `false` to exclude it.
+Two filter callback are provided for convince:
+* `ON_STA_FILTER` - return true when requests are made to the STA (station mode) interface.
+* `ON_AP_FILTER` - return true when requests are made to the AP (access point) interface.
+
+### Serve different site files in AP mode
+```cpp
+server.serveStatic("/", SPIFFS, "/www/").setFilter(ON_STA_FILTER);
+server.serveStatic("/", SPIFFS, "/ap/").setFilter(ON_AP_FILTER);
+```
+
+### Rewrite to different index on AP
+```cpp
+// Serve the file "/www/index-ap.htm" in AP, and the file "/www/index.htm" on STA
+server.rewrite("/", "index.htm");
+server.rewrite("/index.htm", "index-ap.htm").setFilter(ON_AP_FILTER);
+server.serveStatic("/", SPIFFS, "/www/");
+```
+
+### Serving different hosts
+```cpp
+// Filter callback using request host
+bool filterOnHost1(AsyncWebServerRequest *request) { return request->host() == "host1"; }
+
+// Server setup: server files in "/host1/" to requests for "host1", and files in "/www/" otherwise.
+server.serveStatic("/", SPIFFS, "/host1/").setFilter(filterOnHost1);
+server.serveStatic("/", SPIFFS, "/www/");
+```
+
+## Bad Responses
+Some responses are implemented, but you should not use them, because they do not conform to HTTP.
+The following example will lead to unclean close of the connection and more time wasted
+than providing the length of the content
+
+### Respond with content using a callback without content length to HTTP/1.0 clients
+```cpp
+//This is used as fallback for chunked responses to HTTP/1.0 Clients
+request->send("text/plain", 0, [](uint8_t *buffer, size_t maxLen, size_t index) -> size_t {
+  //Write up to "maxLen" bytes into "buffer" and return the amount written.
+  //You will be asked for more data until 0 is returned
+  //Keep in mind that you can not delay or yield waiting for more data!
+  return mySource.read(buffer, maxLen);
+});
+```
+
+## Async WebSocket Plugin
+The server includes a web socket plugin which lets you define different WebSocket locations to connect to
+without starting another listening service or using different port
+
+### Async WebSocket Event
+```cpp
+
+void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){
+  if(type == WS_EVT_CONNECT){
+    //client connected
+    os_printf("ws[%s][%u] connect\n", server->url(), client->id());
+    client->printf("Hello Client %u :)", client->id());
+    client->ping();
+  } else if(type == WS_EVT_DISCONNECT){
+    //client disconnected
+    os_printf("ws[%s][%u] disconnect: %u\n", server->url(), client->id());
+  } else if(type == WS_EVT_ERROR){
+    //error was received from the other end
+    os_printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t*)arg), (char*)data);
+  } else if(type == WS_EVT_PONG){
+    //pong message was received (in response to a ping request maybe)
+    os_printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len)?(char*)data:"");
+  } else if(type == WS_EVT_DATA){
+    //data packet
+    AwsFrameInfo * info = (AwsFrameInfo*)arg;
+    if(info->final && info->index == 0 && info->len == len){
+      //the whole message is in a single frame and we got all of it's data
+      os_printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT)?"text":"binary", info->len);
+      if(info->opcode == WS_TEXT){
+        data[len] = 0;
+        os_printf("%s\n", (char*)data);
+      } else {
+        for(size_t i=0; i < info->len; i++){
+          os_printf("%02x ", data[i]);
+        }
+        os_printf("\n");
+      }
+      if(info->opcode == WS_TEXT)
+        client->text("I got your text message");
+      else
+        client->binary("I got your binary message");
+    } else {
+      //message is comprised of multiple frames or the frame is split into multiple packets
+      if(info->index == 0){
+        if(info->num == 0)
+          os_printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary");
+        os_printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len);
+      }
+
+      os_printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT)?"text":"binary", info->index, info->index + len);
+      if(info->message_opcode == WS_TEXT){
+        data[len] = 0;
+        os_printf("%s\n", (char*)data);
+      } else {
+        for(size_t i=0; i < len; i++){
+          os_printf("%02x ", data[i]);
+        }
+        os_printf("\n");
+      }
+
+      if((info->index + len) == info->len){
+        os_printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len);
+        if(info->final){
+          os_printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary");
+          if(info->message_opcode == WS_TEXT)
+            client->text("I got your text message");
+          else
+            client->binary("I got your binary message");
+        }
+      }
+    }
+  }
+}
+```
+
+### Methods for sending data to a socket client
+```cpp
+
+
+
+//Server methods
+AsyncWebSocket ws("/ws");
+//printf to a client
+ws.printf((uint32_t)client_id, arguments...);
+//printf to all clients
+ws.printfAll(arguments...);
+//printf_P to a client
+ws.printf_P((uint32_t)client_id, PSTR(format), arguments...);
+//printfAll_P to all clients
+ws.printf_P(PSTR(format), arguments...);
+//send text to a client
+ws.text((uint32_t)client_id, (char*)text);
+ws.text((uint32_t)client_id, (uint8_t*)text, (size_t)len);
+//send text from PROGMEM to a client
+ws.text((uint32_t)client_id, PSTR("text"));
+const char flash_text[] PROGMEM = "Text to send"
+ws.text((uint32_t)client_id, FPSTR(flash_text));
+//send text to all clients
+ws.textAll((char*)text);
+ws.textAll((uint8_t*)text, (size_t)len);
+//send binary to a client
+ws.binary((uint32_t)client_id, (char*)binary);
+ws.binary((uint32_t)client_id, (uint8_t*)binary, (size_t)len);
+//send binary from PROGMEM to a client
+const uint8_t flash_binary[] PROGMEM = { 0x01, 0x02, 0x03, 0x04 };
+ws.binary((uint32_t)client_id, flash_binary, 4);
+//send binary to all clients
+ws.binaryAll((char*)binary);
+ws.binaryAll((uint8_t*)binary, (size_t)len);
+
+//client methods
+AsyncWebSocketClient * client;
+//printf
+client->printf(arguments...);
+//printf_P
+client->printf_P(PSTR(format), arguments...);
+//send text
+client->text((char*)text);
+client->text((uint8_t*)text, (size_t)len);
+//send text from PROGMEM
+client->text(PSTR("text"));
+const char flash_text[] PROGMEM = "Text to send";
+client->text(FPSTR(flash_text));
+//send binary
+client->binary((char*)binary);
+client->binary((uint8_t*)binary, (size_t)len);
+//send binary from PROGMEM
+const uint8_t flash_binary[] PROGMEM = { 0x01, 0x02, 0x03, 0x04 };
+client->binary(flash_binary, 4);
+```
+
+## Async Event Source Plugin
+The server includes EventSource (Server-Sent Events) plugin which can be used to send short text events to the browser.
+Difference between EventSource and WebSockets is that EventSource is single direction, text-only protocol.
+
+### Setup Event Source on the server
+```cpp
+AsyncWebServer server(80);
+AsyncEventSource events("/events");
+
+void setup(){
+  // setup ......
+  events.onConnect([](AsyncEventSourceClient *client){
+    if(client->lastId()){
+      Serial.printf("Client reconnected! Last message ID that it gat is: %u\n", client->lastId());
+    }
+    //send event with message "hello!", id current millis
+    // and set reconnect delay to 1 second
+    client->send("hello!",NULL,millis(),1000);
+  });
+  server.addHandler(&events);
+  // setup ......
+}
+
+void loop(){
+  if(eventTriggered){ // your logic here
+    //send event "myevent"
+    events.send("my event content","myevent",millis());
+  }
+}
+```
+
+### Setup Event Source in the browser
+```javascript
+if (!!window.EventSource) {
+  var source = new EventSource('/events');
+
+  source.addEventListener('open', function(e) {
+    console.log("Events Connected");
+  }, false);
+
+  source.addEventListener('error', function(e) {
+    if (e.target.readyState != EventSource.OPEN) {
+      console.log("Events Disconnected");
+    }
+  }, false);
+
+  source.addEventListener('message', function(e) {
+    console.log("message", e.data);
+  }, false);
+
+  source.addEventListener('myevent', function(e) {
+    console.log("myevent", e.data);
+  }, false);
+}
+```
+
+## Setting up the server
+```cpp
+#include "ESPAsyncTCP.h"
+#include "ESPAsyncWebServer.h"
+
+AsyncWebServer server(80);
+AsyncWebSocket ws("/ws"); // access at ws://[esp ip]/ws
+AsyncEventSource events("/events"); // event source (Server-Sent events)
+
+const char* ssid = "your-ssid";
+const char* password = "your-pass";
+const char* http_username = "admin";
+const char* http_password = "admin";
+
+//flag to use from web update to reboot the ESP
+bool shouldReboot = false;
+
+void onRequest(AsyncWebServerRequest *request){
+  //Handle Unknown Request
+  request->send(404);
+}
+
+void onBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
+  //Handle body
+}
+
+void onUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+  //Handle upload
+}
+
+void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){
+  //Handle WebSocket event
+}
+
+void setup(){
+  Serial.begin(115200);
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(ssid, password);
+  if (WiFi.waitForConnectResult() != WL_CONNECTED) {
+    Serial.printf("WiFi Failed!\n");
+    return;
+  }
+
+  // attach AsyncWebSocket
+  ws.onEvent(onEvent);
+  server.addHandler(&ws);
+
+  // attach AsyncEventSource
+  server.addHandler(&events);
+
+  // respond to GET requests on URL /heap
+  server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){
+    request->send(200, "text/plain", String(ESP.getFreeHeap()));
+  });
+
+  // upload a file to /upload
+  server.on("/upload", HTTP_POST, [](AsyncWebServerRequest *request){
+    request->send(200);
+  }, onUpload);
+
+  // send a file when /index is requested
+  server.on("/index", HTTP_ANY, [](AsyncWebServerRequest *request){
+    request->send(SPIFFS, "/index.htm");
+  });
+
+  // HTTP basic authentication
+  server.on("/login", HTTP_GET, [](AsyncWebServerRequest *request){
+    if(!request->authenticate(http_username, http_password))
+        return request->requestAuthentication();
+    request->send(200, "text/plain", "Login Success!");
+  });
+  
+  // Simple Firmware Update Form
+  server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
+    request->send(200, "text/html", "<form method='POST' action='/update' enctype='multipart/form-data'><input type='file' name='update'><input type='submit' value='Update'></form>");
+  });
+  server.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){
+    shouldReboot = !Update.hasError();
+    AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", shouldReboot?"OK":"FAIL");
+    response->addHeader("Connection", "close");
+    request->send(response);
+  },[](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+    if(!index){
+      Serial.printf("Update Start: %s\n", filename.c_str());
+      Update.runAsync(true);
+      if(!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)){
+        Update.printError(Serial);
+      }
+    }
+    if(!Update.hasError()){
+      if(Update.write(data, len) != len){
+        Update.printError(Serial);
+      }
+    }
+    if(final){
+      if(Update.end(true)){
+        Serial.printf("Update Success: %uB\n", index+len);
+      } else {
+        Update.printError(Serial);
+      }
+    }
+  });
+
+  // attach filesystem root at URL /fs
+  server.serveStatic("/fs", SPIFFS, "/");
+
+  // Catch-All Handlers
+  // Any request that can not find a Handler that canHandle it
+  // ends in the callbacks below.
+  server.onNotFound(onRequest);
+  server.onFileUpload(onUpload);
+  server.onRequestBody(onBody);
+
+  server.begin();
+}
+
+void loop(){
+  if(shouldReboot){
+    Serial.println("Rebooting...");
+    delay(100);
+    ESP.restart();
+  }
+  static char temp[128];
+  sprintf(temp, "Seconds since boot: %u", millis()/1000);
+  events.send(temp, "time"); //send event "time"
+}
+```
+
+### Methods for controlling websocket connections
+
+```arduino
+  // Disable client connections if it was activated
+  if ( ws.enabled() )
+    ws.enable(false);
+
+  // enable client connections if it was disabled
+  if ( !ws.enabled() )
+    ws.enable(true);
+```
+
+Example of OTA code
+
+```arduino
+  // OTA callbacks
+  ArduinoOTA.onStart([]() {
+    // Clean SPIFFS
+    SPIFFS.end();
+
+    // Disable client connections    
+    ws.enable(false);
+
+    // Advertise connected clients what's going on
+    ws.textAll("OTA Update Started");
+
+    // Close them
+    ws.closeAll();
+
+  });
+
+```
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/.esp8266.skip b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/.esp8266.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/ESP32_AsyncFSBrowser.ino b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/ESP32_AsyncFSBrowser.ino
new file mode 100644
index 0000000..614ba69
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/ESP32_AsyncFSBrowser.ino
@@ -0,0 +1,273 @@
+#include <ESP31BWiFi.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+#include <FS.h>
+
+// WEB HANDLER IMPLEMENTATION
+class SPIFFSEditor: public AsyncWebHandler {
+  private:
+    String _username;
+    String _password;
+    bool _uploadAuthenticated;
+  public:
+    SPIFFSEditor(String username=String(), String password=String()):_username(username),_password(password),_uploadAuthenticated(false){}
+    bool canHandle(AsyncWebServerRequest *request){
+      if(request->method() == HTTP_GET && request->url() == "/edit" && (SPIFFS.exists("/edit.htm") || SPIFFS.exists("/edit.htm.gz")))
+        return true;
+      else if(request->method() == HTTP_GET && request->url() == "/list")
+        return true;
+      else if(request->method() == HTTP_GET && (request->url().endsWith("/") || SPIFFS.exists(request->url()) || (!request->hasParam("download") && SPIFFS.exists(request->url()+".gz"))))
+        return true;
+      else if(request->method() == HTTP_POST && request->url() == "/edit")
+        return true;
+      else if(request->method() == HTTP_DELETE && request->url() == "/edit")
+        return true;
+      else if(request->method() == HTTP_PUT && request->url() == "/edit")
+        return true;
+      return false;
+    }
+
+    void handleRequest(AsyncWebServerRequest *request){
+      if(_username.length() && (request->method() != HTTP_GET || request->url() == "/edit" || request->url() == "/list") && !request->authenticate(_username.c_str(),_password.c_str()))
+        return request->requestAuthentication();
+
+      if(request->method() == HTTP_GET && request->url() == "/edit"){
+        request->send(SPIFFS, "/edit.htm");
+      } else if(request->method() == HTTP_GET && request->url() == "/list"){
+        if(request->hasParam("dir")){
+          String path = request->getParam("dir")->value();
+          Dir dir = SPIFFS.openDir(path);
+          path = String();
+          String output = "[";
+          while(dir.next()){
+            File entry = dir.openFile("r");
+            if (output != "[") output += ',';
+            bool isDir = false;
+            output += "{\"type\":\"";
+            output += (isDir)?"dir":"file";
+            output += "\",\"name\":\"";
+            output += String(entry.name()).substring(1);
+            output += "\"}";
+            entry.close();
+          }
+          output += "]";
+          request->send(200, "text/json", output);
+          output = String();
+        }
+        else
+          request->send(400);
+      } else if(request->method() == HTTP_GET){
+        String path = request->url();
+        if(path.endsWith("/"))
+          path += "index.htm";
+        request->send(SPIFFS, path, String(), request->hasParam("download"));
+      } else if(request->method() == HTTP_DELETE){
+        if(request->hasParam("path", true)){
+          SPIFFS.remove(request->getParam("path", true)->value());
+          request->send(200, "", "DELETE: "+request->getParam("path", true)->value());
+        } else
+          request->send(404);
+      } else if(request->method() == HTTP_POST){
+        if(request->hasParam("data", true, true) && SPIFFS.exists(request->getParam("data", true, true)->value()))
+          request->send(200, "", "UPLOADED: "+request->getParam("data", true, true)->value());
+        else
+          request->send(500);
+      } else if(request->method() == HTTP_PUT){
+        if(request->hasParam("path", true)){
+          String filename = request->getParam("path", true)->value();
+          if(SPIFFS.exists(filename)){
+            request->send(200);
+          } else {
+            File f = SPIFFS.open(filename, "w");
+            if(f){
+              f.write(0x00);
+              f.close();
+              request->send(200, "", "CREATE: "+filename);
+            } else {
+              request->send(500);
+            }
+          }
+        } else
+          request->send(400);
+      }
+    }
+
+    void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+      if(!index){
+        if(!_username.length() || request->authenticate(_username.c_str(),_password.c_str()))
+          _uploadAuthenticated = true;
+        request->_tempFile = SPIFFS.open(filename, "w");
+      }
+      if(_uploadAuthenticated && request->_tempFile && len){
+        request->_tempFile.write(data,len);
+      }
+      if(_uploadAuthenticated && final)
+        if(request->_tempFile) request->_tempFile.close();
+    }
+};
+
+
+// SKETCH BEGIN
+AsyncWebServer server(80);
+
+AsyncWebSocket ws("/ws");
+
+void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){
+  if(type == WS_EVT_CONNECT){
+    os_printf("ws[%s][%u] connect\n", server->url(), client->id());
+    client->printf("Hello Client %u :)", client->id());
+    client->ping();
+  } else if(type == WS_EVT_DISCONNECT){
+    os_printf("ws[%s][%u] disconnect: %u\n", server->url(), client->id());
+  } else if(type == WS_EVT_ERROR){
+    os_printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t*)arg), (char*)data);
+  } else if(type == WS_EVT_PONG){
+    os_printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len)?(char*)data:"");
+  } else if(type == WS_EVT_DATA){
+    AwsFrameInfo * info = (AwsFrameInfo*)arg;
+    String msg = "";
+    if(info->final && info->index == 0 && info->len == len){
+      //the whole message is in a single frame and we got all of it's data
+      os_printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT)?"text":"binary", info->len);
+      if(info->opcode == WS_TEXT){
+        for(size_t i=0; i < info->len; i++) {
+          msg += (char) data[i];
+        }
+      } else {
+        char buff[3];
+        for(size_t i=0; i < info->len; i++) {
+          sprintf(buff, "%02x ", (uint8_t) data[i]);
+          msg += buff ;
+        }
+      }
+      os_printf("%s\n",msg.c_str());
+      if(info->opcode == WS_TEXT)
+        client->text("I got your text message");
+      else
+        client->binary("I got your binary message");
+    } else {
+      //message is comprised of multiple frames or the frame is split into multiple packets
+      if(info->index == 0){
+        if(info->num == 0)
+          os_printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary");
+        os_printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len);
+      }
+
+      os_printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT)?"text":"binary", info->index, info->index + len);
+      if(info->opcode == WS_TEXT){
+        for(size_t i=0; i < info->len; i++) {
+          msg += (char) data[i];
+        }
+      } else {
+        char buff[3];
+        for(size_t i=0; i < info->len; i++) {
+          sprintf(buff, "%02x ", (uint8_t) data[i]);
+          msg += buff ;
+        }
+      }
+      os_printf("%s\n",msg.c_str());
+
+
+      if((info->index + len) == info->len){
+        os_printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len);
+        if(info->final){
+          os_printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT)?"text":"binary");
+          if(info->message_opcode == WS_TEXT)
+            client->text("I got your text message");
+          else
+            client->binary("I got your binary message");
+        }
+      }
+    }
+  }
+}
+
+const char* ssid = "*******";
+const char* password = "*******";
+const char* http_username = "admin";
+const char* http_password = "admin";
+
+void setup(){
+  Serial.begin(115200);
+  Serial.setDebugOutput(true);
+  SPIFFS.begin();
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(ssid, password);
+  if(WiFi.waitForConnectResult() != WL_CONNECTED){
+    Serial.printf("WiFi Failed!\n");
+  }
+
+  ws.onEvent(onEvent);
+  server.addHandler(&ws);
+  
+  server.serveStatic("/fs", SPIFFS, "/");
+
+  server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){
+    request->send(200, "text/plain", String(ESP.getFreeHeap()));
+  });
+  server.addHandler(new SPIFFSEditor(http_username,http_password));
+
+  server.onNotFound([](AsyncWebServerRequest *request){
+    os_printf("NOT_FOUND: ");
+    if(request->method() == HTTP_GET)
+      os_printf("GET");
+    else if(request->method() == HTTP_POST)
+      os_printf("POST");
+    else if(request->method() == HTTP_DELETE)
+      os_printf("DELETE");
+    else if(request->method() == HTTP_PUT)
+      os_printf("PUT");
+    else if(request->method() == HTTP_PATCH)
+      os_printf("PATCH");
+    else if(request->method() == HTTP_HEAD)
+      os_printf("HEAD");
+    else if(request->method() == HTTP_OPTIONS)
+      os_printf("OPTIONS");
+    else
+      os_printf("UNKNOWN");
+    os_printf(" http://%s%s\n", request->host().c_str(), request->url().c_str());
+
+    if(request->contentLength()){
+      os_printf("_CONTENT_TYPE: %s\n", request->contentType().c_str());
+      os_printf("_CONTENT_LENGTH: %u\n", request->contentLength());
+    }
+
+    int headers = request->headers();
+    int i;
+    for(i=0;i<headers;i++){
+      AsyncWebHeader* h = request->getHeader(i);
+      os_printf("_HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str());
+    }
+
+    int params = request->params();
+    for(i=0;i<params;i++){
+      AsyncWebParameter* p = request->getParam(i);
+      if(p->isFile()){
+        os_printf("_FILE[%s]: %s, size: %u\n", p->name().c_str(), p->value().c_str(), p->size());
+      } else if(p->isPost()){
+        os_printf("_POST[%s]: %s\n", p->name().c_str(), p->value().c_str());
+      } else {
+        os_printf("_GET[%s]: %s\n", p->name().c_str(), p->value().c_str());
+      }
+    }
+
+    request->send(404);
+  });
+  server.onFileUpload([](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+    if(!index)
+      os_printf("UploadStart: %s\n", filename.c_str());
+    os_printf("%s", (const char*)data);
+    if(final)
+      os_printf("UploadEnd: %s (%u)\n", filename.c_str(), index+len);
+  });
+  server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
+    if(!index)
+      os_printf("BodyStart: %u\n", total);
+    os_printf("%s", (const char*)data);
+    if(index + len == total)
+      os_printf("BodyEnd: %u\n", total);
+  });
+  server.begin();
+}
+
+void loop(){}
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/edit.htm.gz b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/edit.htm.gz
new file mode 100644
index 0000000..9ee1b81
Binary files /dev/null and b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/edit.htm.gz differ
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/favicon.ico b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/favicon.ico
new file mode 100644
index 0000000..71b25fe
Binary files /dev/null and b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/favicon.ico differ
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/graphs.js.gz b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/graphs.js.gz
new file mode 100644
index 0000000..e0e13f6
Binary files /dev/null and b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/graphs.js.gz differ
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/index.htm b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/index.htm
new file mode 100644
index 0000000..b9aea57
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/examples/ESP32_AsyncFSBrowser/data/index.htm
@@ -0,0 +1,110 @@
+<!-- 
+  FSWebServer - Example Index Page
+  Copyright (c) 2015 Hristo Gochkov. All rights reserved.
+  This file is part of the ESP8266WebServer library for Arduino environment.
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <title>WebSocketTester</title>
+    <style type="text/css" media="screen">
+    body {
+      margin:0;
+      padding:0;
+      background-color: black;
+    }
+    
+    #dbg, #input_div, #input_el {
+      font-family: monaco;
+      font-size: 12px;
+      line-height: 13px;
+      color: #AAA;
+    }
+    
+    #dbg, #input_div {
+      margin:0;
+      padding:0;
+      padding-left:4px;
+    }
+    
+    #input_el {
+      width:98%;
+      background-color: rgba(0,0,0,0);
+      border: 0px;
+    }
+    #input_el:focus {
+      outline: none;
+    }
+    </style>
+    <script type="text/javascript">
+    var ws = null;
+    function ge(s){ return document.getElementById(s);}
+    function ce(s){ return document.createElement(s);}
+    function stb(){ window.scrollTo(0, document.body.scrollHeight || document.documentElement.scrollHeight); }
+    function sendBlob(str){
+      var buf = new Uint8Array(str.length);
+      for (var i = 0; i < str.length; ++i) buf[i] = str.charCodeAt(i);
+      ws.send(buf);
+    }
+    function addMessage(m){
+      var msg = ce("div");
+      msg.innerText = m;
+      ge("dbg").appendChild(msg);
+      stb();
+    }
+    function startSocket(){
+      ws = new WebSocket('ws://'+document.location.host+'/ws',['arduino']);
+      ws.binaryType = "arraybuffer";
+      ws.onopen = function(e){
+        addMessage("Connected");
+      };
+      ws.onclose = function(e){
+        addMessage("Disconnected");
+      };
+      ws.onerror = function(e){
+        console.log("ws error", e);
+        addMessage("Error");
+      };
+      ws.onmessage = function(e){
+        var msg = "";
+        if(e.data instanceof ArrayBuffer){
+          msg = "BIN:";
+          var bytes = new Uint8Array(e.data);
+          for (var i = 0; i < bytes.length; i++) {
+            msg += String.fromCharCode(bytes[i]);
+          }
+        } else {
+          msg = "TXT:"+e.data;
+        }
+        addMessage(msg);
+      };
+      ge("input_el").onkeydown = function(e){
+        stb();
+        if(e.keyCode == 13 && ge("input_el").value != ""){
+          ws.send(ge("input_el").value);
+          ge("input_el").value = "";
+        }
+      }
+    }
+    </script>
+  </head>
+  <body id="body" onload="startSocket()">
+    <pre id="dbg"></pre>
+    <div id="input_div">
+      $<input type="text" value="" id="input_el">
+    </div>
+  </body>
+</html>
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/.esp31b.skip b/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/.esp31b.skip
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino b/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino
new file mode 100644
index 0000000..19635dc
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino
@@ -0,0 +1,131 @@
+#include "ESPAsyncTCP.h"
+#include "ESPAsyncWebServer.h"
+#include <ESP8266WiFi.h>
+#include <ESP8266mDNS.h>
+#include <ArduinoOTA.h>
+#include <FS.h>
+#include <Hash.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+
+AsyncWebServer server(80);
+AsyncWebSocket ws("/ws"); // access at ws://[esp ip]/ws
+AsyncEventSource events("/events"); // event source (Server-Sent events)
+
+const char* ssid = "Mole2";
+const char* password = "notforyou";
+const char* http_username = "admin";
+const char* http_password = "admin";
+
+//flag to use from web update to reboot the ESP
+bool shouldReboot = false;
+
+void onRequest(AsyncWebServerRequest *request){
+  //Handle Unknown Request
+  request->send(404);
+}
+
+void onBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
+  //Handle body
+}
+
+void onUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+  //Handle upload
+}
+
+void onEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){
+  //Handle WebSocket event
+}
+
+void setup(){
+  Serial.begin(115200);
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(ssid, password);
+  if (WiFi.waitForConnectResult() != WL_CONNECTED) {
+    Serial.printf("WiFi Failed!\n");
+    return;
+  }
+
+  // attach AsyncWebSocket
+  ws.onEvent(onEvent);
+  server.addHandler(&ws);
+
+  // attach AsyncEventSource
+  server.addHandler(&events);
+
+  // respond to GET requests on URL /heap
+  server.on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){
+    request->send(200, "text/plain", String(ESP.getFreeHeap()));
+  });
+
+  // upload a file to /upload
+  server.on("/upload", HTTP_POST, [](AsyncWebServerRequest *request){
+    request->send(200);
+  }, onUpload);
+
+  // send a file when /index is requested
+  server.on("/index", HTTP_ANY, [](AsyncWebServerRequest *request){
+    request->send(SPIFFS, "/index.htm");
+  });
+
+  // HTTP basic authentication
+  server.on("/login", HTTP_GET, [](AsyncWebServerRequest *request){
+    if(!request->authenticate(http_username, http_password))
+        return request->requestAuthentication();
+    request->send(200, "text/plain", "Login Success!");
+  });
+
+  // Simple Firmware Update Form
+  server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
+    request->send(200, "text/html", "<form method='POST' action='/update' enctype='multipart/form-data'><input type='file' name='update'><input type='submit' value='Update'></form>");
+  });
+  server.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){
+    shouldReboot = !Update.hasError();
+    AsyncWebServerResponse *response = request->beginResponse(200, "text/plain", shouldReboot?"OK":"FAIL");
+    response->addHeader("Connection", "close");
+    request->send(response);
+  },[](AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+    if(!index){
+      Serial.printf("Update Start: %s\n", filename.c_str());
+      Update.runAsync(true);
+      if(!Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000)){
+        Update.printError(Serial);
+      }
+    }
+    if(!Update.hasError()){
+      if(Update.write(data, len) != len){
+        Update.printError(Serial);
+      }
+    }
+    if(final){
+      if(Update.end(true)){
+        Serial.printf("Update Success: %uB\n", index+len);
+      } else {
+        Update.printError(Serial);
+      }
+    }
+  });
+
+  // attach filesystem root at URL /fs
+  server.serveStatic("/fs", SPIFFS, "/");
+
+  // Catch-All Handlers
+  // Any request that can not find a Handler that canHandle it
+  // ends in the callbacks below.
+  server.onNotFound(onRequest);
+  server.onFileUpload(onUpload);
+  server.onRequestBody(onBody);
+
+  server.begin();
+}
+
+void loop(){
+  if(shouldReboot){
+    Serial.println("Rebooting...");
+    delay(100);
+    ESP.restart();
+  }
+  static char temp[128];
+  sprintf(temp, "Seconds since boot: %u", millis()/1000);
+  events.send(temp, "time"); //send event "time"
+}
\ No newline at end of file
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/data/favicon.ico b/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/data/favicon.ico
new file mode 100644
index 0000000..71b25fe
Binary files /dev/null and b/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/data/favicon.ico differ
diff --git a/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/data/index.htm b/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/data/index.htm
new file mode 100644
index 0000000..28f47e9
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/examples/ESP_AsyncFSBrowser/data/index.htm
@@ -0,0 +1,131 @@
+<!--
+  FSWebServer - Example Index Page
+  Copyright (c) 2015 Hristo Gochkov. All rights reserved.
+  This file is part of the ESP8266WebServer library for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <title>WebSocketTester</title>
+    <style type="text/css" media="screen">
+    body {
+      margin:0;
+      padding:0;
+      background-color: black;
+    }
+
+    #dbg, #input_div, #input_el {
+      font-family: monaco;
+      font-size: 12px;
+      line-height: 13px;
+      color: #AAA;
+    }
+
+    #dbg, #input_div {
+      margin:0;
+      padding:0;
+      padding-left:4px;
+    }
+
+    #input_el {
+      width:98%;
+      background-color: rgba(0,0,0,0);
+      border: 0px;
+    }
+    #input_el:focus {
+      outline: none;
+    }
+    </style>
+    <script type="text/javascript">
+    var ws = null;
+    function ge(s){ return document.getElementById(s);}
+    function ce(s){ return document.createElement(s);}
+    function stb(){ window.scrollTo(0, document.body.scrollHeight || document.documentElement.scrollHeight); }
+    function sendBlob(str){
+      var buf = new Uint8Array(str.length);
+      for (var i = 0; i < str.length; ++i) buf[i] = str.charCodeAt(i);
+      ws.send(buf);
+    }
+    function addMessage(m){
+      var msg = ce("div");
+      msg.innerText = m;
+      ge("dbg").appendChild(msg);
+      stb();
+    }
+    function startSocket(){
+      ws = new WebSocket('ws://'+document.location.host+'/ws',['arduino']);
+      ws.binaryType = "arraybuffer";
+      ws.onopen = function(e){
+        addMessage("Connected");
+      };
+      ws.onclose = function(e){
+        addMessage("Disconnected");
+      };
+      ws.onerror = function(e){
+        console.log("ws error", e);
+        addMessage("Error");
+      };
+      ws.onmessage = function(e){
+        var msg = "";
+        if(e.data instanceof ArrayBuffer){
+          msg = "BIN:";
+          var bytes = new Uint8Array(e.data);
+          for (var i = 0; i < bytes.length; i++) {
+            msg += String.fromCharCode(bytes[i]);
+          }
+        } else {
+          msg = "TXT:"+e.data;
+        }
+        addMessage(msg);
+      };
+      ge("input_el").onkeydown = function(e){
+        stb();
+        if(e.keyCode == 13 && ge("input_el").value != ""){
+          ws.send(ge("input_el").value);
+          ge("input_el").value = "";
+        }
+      }
+    }
+    function startEvents(){
+      var es = new EventSource('/events');
+      es.onopen = function(e) {
+        addMessage("Events Opened");
+      };
+      es.onerror = function(e) {
+        if (e.target.readyState != EventSource.OPEN) {
+          addMessage("Events Closed");
+        }
+      };
+      es.onmessage = function(e) {
+        addMessage("Event: " + e.data);
+      };
+      es.addEventListener('ota', function(e) {
+        addMessage("Event[ota]: " + e.data);
+      }, false);
+    }
+    function onBodyLoad(){
+      startSocket();
+      startEvents();
+    }
+    </script>
+  </head>
+  <body id="body" onload="onBodyLoad()">
+    <pre id="dbg"></pre>
+    <div id="input_div">
+      $<input type="text" value="" id="input_el">
+    </div>
+  </body>
+</html>
diff --git a/libraries/ESPAsyncWebServer-master/keywords.txt b/libraries/ESPAsyncWebServer-master/keywords.txt
new file mode 100644
index 0000000..c391e6c
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/keywords.txt
@@ -0,0 +1,3 @@
+JsonArray	KEYWORD1
+add	KEYWORD2
+createArray	KEYWORD3
diff --git a/libraries/ESPAsyncWebServer-master/library.json b/libraries/ESPAsyncWebServer-master/library.json
new file mode 100644
index 0000000..75eeade
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/library.json
@@ -0,0 +1,21 @@
+{
+  "name":"ESPAsyncWebServer",
+  "description":"Asynchronous HTTP and WebSocket Server Library for ESP8266 and ESP32",
+  "keywords":"http,async,websocket,webserver",
+  "authors":
+  {
+    "name": "Hristo Gochkov",
+    "maintainer": true
+  },
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/me-no-dev/ESPAsyncWebServer.git"
+  },
+  "frameworks": "arduino",
+  "platforms":"espressif",
+  "dependencies":
+  {
+    "name": "ESPAsyncTCP"
+  }
+}
diff --git a/libraries/ESPAsyncWebServer-master/library.properties b/libraries/ESPAsyncWebServer-master/library.properties
new file mode 100644
index 0000000..18bbbbd
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/library.properties
@@ -0,0 +1,9 @@
+name=ESP Async WebServer
+version=1.0.0
+author=Me-No-Dev
+maintainer=Me-No-Dev
+sentence=Async Web Server for ESP8266 and ESP31B
+paragraph=Async Web Server for ESP8266 and ESP31B
+category=Other
+url=https://github.com/me-no-dev/ESPAsyncWebServer
+architectures=*
diff --git a/libraries/ESPAsyncWebServer-master/src/AsyncEventSource.cpp b/libraries/ESPAsyncWebServer-master/src/AsyncEventSource.cpp
new file mode 100644
index 0000000..6262be5
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/AsyncEventSource.cpp
@@ -0,0 +1,287 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "Arduino.h"
+#include "AsyncEventSource.h"
+
+static String generateEventMessage(const char *message, const char *event, uint32_t id, uint32_t reconnect){
+  String ev = "";
+
+  if(reconnect){
+    ev += "retry: ";
+    ev += String(reconnect);
+    ev += "\r\n";
+  }
+
+  if(id){
+    ev += "id: ";
+    ev += String(id);
+    ev += "\r\n";
+  }
+
+  if(event != NULL){
+    ev += "event: ";
+    ev += String(event);
+    ev += "\r\n";
+  }
+
+  if(message != NULL){
+    size_t messageLen = strlen(message);
+    char * lineStart = (char *)message;
+    char * lineEnd;
+    do {
+      char * nextN = strchr(lineStart, '\n');
+      char * nextR = strchr(lineStart, '\r');
+      if(nextN == NULL && nextR == NULL){
+        size_t llen = ((char *)message + messageLen) - lineStart;
+        char * ldata = (char *)malloc(llen+1);
+        if(ldata != NULL){
+          memcpy(ldata, lineStart, llen);
+          ldata[llen] = 0;
+          ev += "data: ";
+          ev += ldata;
+          ev += "\r\n\r\n";
+          free(ldata);
+        }
+        lineStart = (char *)message + messageLen;
+      } else {
+        char * nextLine = NULL;
+        if(nextN != NULL && nextR != NULL){
+          if(nextR < nextN){
+            lineEnd = nextR;
+            if(nextN == (nextR + 1))
+              nextLine = nextN + 1;
+            else
+              nextLine = nextR + 1;
+          } else {
+            lineEnd = nextN;
+            if(nextR == (nextN + 1))
+              nextLine = nextR + 1;
+            else
+              nextLine = nextN + 1;
+          }
+        } else if(nextN != NULL){
+          lineEnd = nextN;
+          nextLine = nextN + 1;
+        } else {
+          lineEnd = nextR;
+          nextLine = nextR + 1;
+        }
+
+        size_t llen = lineEnd - lineStart;
+        char * ldata = (char *)malloc(llen+1);
+        if(ldata != NULL){
+          memcpy(ldata, lineStart, llen);
+          ldata[llen] = 0;
+          ev += "data: ";
+          ev += ldata;
+          ev += "\r\n";
+          free(ldata);
+        }
+        lineStart = nextLine;
+        if(lineStart == ((char *)message + messageLen))
+          ev += "\r\n";
+      }
+    } while(lineStart < ((char *)message + messageLen));
+  }
+
+  return ev;
+}
+
+// Client
+
+AsyncEventSourceClient::AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server){
+  _client = request->client();
+  _server = server;
+  _lastId = 0;
+  next = NULL;
+  if(request->hasHeader("Last-Event-ID"))
+    _lastId = atoi(request->getHeader("Last-Event-ID")->value().c_str());
+
+  _client->onError(NULL, NULL);
+  _client->onAck(NULL, NULL);
+  _client->onPoll(NULL, NULL);
+  _client->onData(NULL, NULL);
+  _client->onTimeout([](void *r, AsyncClient* c, uint32_t time){ ((AsyncEventSourceClient*)(r))->_onTimeout(time); }, this);
+  _client->onDisconnect([](void *r, AsyncClient* c){ ((AsyncEventSourceClient*)(r))->_onDisconnect(); delete c; }, this);
+  _server->_addClient(this);
+  delete request;
+}
+
+AsyncEventSourceClient::~AsyncEventSourceClient(){
+  close();
+}
+
+void AsyncEventSourceClient::_onTimeout(uint32_t time){
+  _client->close(true);
+}
+
+void AsyncEventSourceClient::_onDisconnect(){
+  _client = NULL;
+  _server->_handleDisconnect(this);
+}
+
+void AsyncEventSourceClient::close(){
+  if(_client != NULL)
+    _client->close();
+}
+
+void AsyncEventSourceClient::write(const char * message, size_t len){
+  if(!_client->canSend()){
+    return;
+  }
+  if(_client->space() < len){
+    return;
+  }
+  _client->write(message, len);
+}
+
+void AsyncEventSourceClient::send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
+  String ev = generateEventMessage(message, event, id, reconnect);
+  write(ev.c_str(), ev.length());
+}
+
+
+// Handler
+
+AsyncEventSource::AsyncEventSource(String url)
+  : _url(url)
+  , _clients(NULL)
+  , _connectcb(NULL)
+{}
+
+AsyncEventSource::~AsyncEventSource(){
+  close();
+}
+
+void AsyncEventSource::onConnect(ArEventHandlerFunction cb){
+  _connectcb = cb;
+}
+
+void AsyncEventSource::_addClient(AsyncEventSourceClient * client){
+  /*char * temp = (char *)malloc(2054);
+  if(temp != NULL){
+    memset(temp+1,' ',2048);
+    temp[0] = ':';
+    temp[2049] = '\r';
+    temp[2050] = '\n';
+    temp[2051] = '\r';
+    temp[2052] = '\n';
+    temp[2053] = 0;
+    client->write((const char *)temp, 2053);
+    free(temp);
+  }*/
+  if(_clients == NULL){
+    _clients = client;
+    if(_connectcb)
+      _connectcb(client);
+    return;
+  }
+  AsyncEventSourceClient * c = _clients;
+  while(c->next != NULL) c = c->next;
+  c->next = client;
+  if(_connectcb)
+    _connectcb(client);
+}
+
+void AsyncEventSource::_handleDisconnect(AsyncEventSourceClient * client){
+  if(_clients == NULL){
+    return;
+  }
+  if(_clients == client){
+    _clients = client->next;
+    delete client;
+    return;
+  }
+  AsyncEventSourceClient * c = _clients;
+  while(c->next != NULL && c->next != client) c = c->next;
+  if(c->next == NULL){
+    return;
+  }
+  c->next = client->next;
+  delete client;
+}
+
+void AsyncEventSource::close(){
+  AsyncEventSourceClient * c = _clients;
+  while(c != NULL){
+    if(c->connected())
+      c->close();
+    c = c->next;
+  }
+}
+
+void AsyncEventSource::send(const char *message, const char *event, uint32_t id, uint32_t reconnect){
+  if(_clients == NULL)
+    return;
+
+  String ev = generateEventMessage(message, event, id, reconnect);
+  AsyncEventSourceClient * c = _clients;
+  while(c != NULL){
+    if(c->connected())
+      c->write(ev.c_str(), ev.length());
+    c = c->next;
+  }
+}
+
+size_t AsyncEventSource::count(){
+  size_t i = 0;
+  AsyncEventSourceClient * c = _clients;
+  while(c != NULL){
+    if(c->connected())
+      i++;
+    c = c->next;
+  }
+  return i;
+}
+
+bool AsyncEventSource::canHandle(AsyncWebServerRequest *request){
+  if(request->method() != HTTP_GET || !request->url().equals(_url))
+    return false;
+  request->addInterestingHeader("Last-Event-ID");
+  return true;
+}
+
+void AsyncEventSource::handleRequest(AsyncWebServerRequest *request){
+  request->send(new AsyncEventSourceResponse(this));
+}
+
+// Response
+
+AsyncEventSourceResponse::AsyncEventSourceResponse(AsyncEventSource *server){
+  _server = server;
+  _code = 200;
+  _contentType = "text/event-stream";
+  _sendContentLength = false;
+  addHeader("Cache-Control", "no-cache");
+  addHeader("Connection","keep-alive");
+}
+
+void AsyncEventSourceResponse::_respond(AsyncWebServerRequest *request){
+  String out = _assembleHead(request->version());
+  request->client()->write(out.c_str(), _headLength);
+  _state = RESPONSE_WAIT_ACK;
+}
+
+size_t AsyncEventSourceResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+  if(len){
+    new AsyncEventSourceClient(request, _server);
+  }
+  return 0;
+}
diff --git a/libraries/ESPAsyncWebServer-master/src/AsyncEventSource.h b/libraries/ESPAsyncWebServer-master/src/AsyncEventSource.h
new file mode 100644
index 0000000..94c1e85
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/AsyncEventSource.h
@@ -0,0 +1,90 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef ASYNCEVENTSOURCE_H_
+#define ASYNCEVENTSOURCE_H_
+
+#include <Arduino.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+
+class AsyncEventSource;
+class AsyncEventSourceResponse;
+class AsyncEventSourceClient;
+typedef std::function<void(AsyncEventSourceClient *client)> ArEventHandlerFunction;
+
+class AsyncEventSourceClient {
+  private:
+    AsyncClient *_client;
+    AsyncEventSource *_server;
+    uint32_t _lastId;
+
+  public:
+    AsyncEventSourceClient * next;
+
+    AsyncEventSourceClient(AsyncWebServerRequest *request, AsyncEventSource *server);
+    ~AsyncEventSourceClient();
+
+    AsyncClient* client(){ return _client; }
+    void close();
+    void write(const char * message, size_t len);
+    void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
+    bool connected(){ return (_client != NULL) && _client->connected(); }
+    uint32_t lastId(){ return _lastId; }
+
+    //system callbacks (do not call)
+    void _onTimeout(uint32_t time);
+    void _onDisconnect();
+};
+
+class AsyncEventSource: public AsyncWebHandler {
+  private:
+    String _url;
+    AsyncEventSourceClient * _clients;
+    ArEventHandlerFunction _connectcb;
+  public:
+    AsyncEventSource(String url);
+    ~AsyncEventSource();
+
+    const char * url(){ return _url.c_str(); }
+    void close();
+    void onConnect(ArEventHandlerFunction cb);
+    void send(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
+    size_t count(); //number clinets connected
+
+    //system callbacks (do not call)
+    void _addClient(AsyncEventSourceClient * client);
+    void _handleDisconnect(AsyncEventSourceClient * client);
+    bool canHandle(AsyncWebServerRequest *request);
+    void handleRequest(AsyncWebServerRequest *request);
+};
+
+class AsyncEventSourceResponse: public AsyncWebServerResponse {
+  private:
+    String _content;
+    AsyncEventSource *_server;
+  public:
+    AsyncEventSourceResponse(AsyncEventSource *server);
+    void _respond(AsyncWebServerRequest *request);
+    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+    bool _sourceValid(){ return true; }
+};
+
+
+#endif /* ASYNCEVENTSOURCE_H_ */
diff --git a/libraries/ESPAsyncWebServer-master/src/AsyncJson.h b/libraries/ESPAsyncWebServer-master/src/AsyncJson.h
new file mode 100644
index 0000000..4ff1ff6
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/AsyncJson.h
@@ -0,0 +1,81 @@
+// ESPasyncJson.h
+/*
+  Async Response to use with arduinoJson and asyncwebserver
+  Written by Andrew Melvin (SticilFace) with help from me-no-dev and BBlanchon.
+
+  example of callback in use
+
+   server.on("/json", HTTP_ANY, [](AsyncWebServerRequest * request) {
+
+    AsyncJsonResponse * response = new AsyncJsonResponse();
+    JsonObject& root = response->getRoot();
+    root["key1"] = "key number one";
+    JsonObject& nested = root.createNestedObject("nested");
+    nested["key1"] = "key number one";
+
+    response->setLength();
+    request->send(response);
+  });
+
+*/
+#ifndef ASYNC_JSON_H_
+#define ASYNC_JSON_H_
+#include <ArduinoJson.h>
+
+/*
+ * Json Response
+ * */
+
+class ChunkPrint : public Print {
+  private:
+    uint8_t* _destination;
+    size_t _to_skip;
+    size_t _to_write;
+    size_t _pos;
+  public:
+    ChunkPrint(uint8_t* destination, size_t from, size_t len)
+      : _destination(destination), _to_skip(from), _to_write(len), _pos{0} {}
+    virtual ~ChunkPrint(){}
+    size_t write(uint8_t c){
+      if (_to_skip > 0) {
+        _to_skip--;
+        return 1;
+      } else if (_to_write > 0) {
+        _to_write--;
+        _destination[_pos++] = c;
+        return 1;
+      }
+      return 0;
+    }
+};
+
+class AsyncJsonResponse: public AsyncAbstractResponse {
+  private:
+    DynamicJsonBuffer _jsonBuffer;
+    JsonVariant _root;
+    bool _isValid;
+  public:
+    AsyncJsonResponse(bool isArray=false): _isValid{false} {
+      _code = 200;
+      _contentType = "text/json";
+      if(isArray)
+        _root = _jsonBuffer.createArray();
+      else
+        _root = _jsonBuffer.createObject();
+    }
+    ~AsyncJsonResponse() {}
+    JsonVariant & getRoot() { return _root; }
+    bool _sourceValid() { return _isValid; }
+    size_t setLength() {
+      _contentLength = _root.measureLength();
+      if (_contentLength) { _isValid = true; }
+      return _contentLength; 
+    }
+
+    size_t _fillBuffer(uint8_t *data, size_t len){
+      ChunkPrint dest(data, _sentLength, len);
+      _root.printTo( dest ) ;
+      return len;
+    }
+};
+#endif
diff --git a/libraries/ESPAsyncWebServer-master/src/AsyncWebSocket.cpp b/libraries/ESPAsyncWebServer-master/src/AsyncWebSocket.cpp
new file mode 100644
index 0000000..92042f3
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/AsyncWebSocket.cpp
@@ -0,0 +1,1003 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "Arduino.h"
+#include "AsyncWebSocket.h"
+
+#include <libb64/cencode.h>
+
+#ifndef ESP8266
+extern "C" {
+typedef struct {
+    uint32_t state[5];
+    uint32_t count[2];
+    unsigned char buffer[64];
+} SHA1_CTX;
+
+void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
+void SHA1Init(SHA1_CTX* context);
+void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len);
+void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
+}
+#else
+#include <Hash.h>
+#endif
+
+
+size_t webSocketSendFrameWindow(AsyncClient *client){
+  if(!client->canSend())
+    return 0;
+  size_t space = client->space();
+  if(space < 9)
+    return 0;
+  return space - 8;
+}
+
+size_t webSocketSendFrame(AsyncClient *client, bool final, uint8_t opcode, bool mask, uint8_t *data, size_t len){
+  if(!client->canSend())
+    return 0;
+  size_t space = client->space();
+  if(space < 2)
+    return 0;
+  uint8_t mbuf[4] = {0,0,0,0};
+  uint8_t headLen = 2;
+  if(len && mask){
+    headLen += 4;
+    mbuf[0] = rand() % 0xFF;
+    mbuf[1] = rand() % 0xFF;
+    mbuf[2] = rand() % 0xFF;
+    mbuf[3] = rand() % 0xFF;
+  }
+  if(len > 125)
+    headLen += 2;
+  if(space < headLen)
+    return 0;
+  space -= headLen;
+
+  if(len > space) len = space;
+
+  uint8_t *buf = (uint8_t*)malloc(headLen);
+  if(buf == NULL){
+    //os_printf("could not malloc %u bytes for frame header\n", headLen);
+    return 0;
+  }
+
+  buf[0] = opcode & 0x0F;
+  if(final)
+    buf[0] |= 0x80;
+  if(len < 126)
+    buf[1] = len & 0x7F;
+  else {
+    buf[1] = 126;
+    buf[2] = (uint8_t)((len >> 8) & 0xFF);
+    buf[3] = (uint8_t)(len & 0xFF);
+  }
+  if(len && mask){
+    buf[1] |= 0x80;
+    memcpy(buf + (headLen - 4), mbuf, 4);
+  }
+  if(client->add((const char *)buf, headLen) != headLen){
+    //os_printf("error adding %lu header bytes\n", headLen);
+    free(buf);
+    return 0;
+  }
+  free(buf);
+
+  if(len){
+    if(len && mask){
+      size_t i;
+      for(i=0;i<len;i++)
+        data[i] = data[i] ^ mbuf[i%4];
+    }
+    if(client->add((const char *)data, len) != len){
+      //os_printf("error adding %lu data bytes\n", len);
+      return 0;
+    }
+  }
+  if(!client->send()){
+    //os_printf("error sending frame: %lu\n", headLen+len);
+    return 0;
+  }
+  return len;
+}
+
+
+
+
+/*
+ * Control Frame
+ */
+
+class AsyncWebSocketControl {
+  private:
+    uint8_t _opcode;
+    uint8_t *_data;
+    size_t _len;
+    bool _mask;
+    bool _finished;
+  public:
+    AsyncWebSocketControl * next;
+    AsyncWebSocketControl(uint8_t opcode, uint8_t *data=NULL, size_t len=0, bool mask=false)
+      :_opcode(opcode)
+      ,_len(len)
+      ,_mask(len && mask)
+      ,_finished(false)
+      ,next(NULL){
+      if(data == NULL)
+        _len = 0;
+      if(_len){
+        if(_len > 125)
+          _len = 125;
+        _data = (uint8_t*)malloc(_len);
+        if(_data == NULL)
+          _len = 0;
+        else memcpy(_data, data, len);
+      } else _data = NULL;
+    }
+    ~AsyncWebSocketControl(){
+      if(_data != NULL)
+        free(_data);
+    }
+    bool finished(){ return _finished; }
+    uint8_t opcode(){ return _opcode; }
+    uint8_t len(){ return _len + 2; }
+    size_t send(AsyncClient *client){
+      _finished = true;
+      return webSocketSendFrame(client, true, _opcode & 0x0F, _mask, _data, _len);
+    }
+};
+
+/*
+ * Basic Buffered Message
+ */
+
+class AsyncWebSocketBasicMessage: public AsyncWebSocketMessage {
+  private:
+    uint8_t * _data;
+    size_t _len;
+    size_t _sent;
+    size_t _ack;
+    size_t _acked;
+
+  public:
+    AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode=WS_TEXT, bool mask=false)
+      :_len(len)
+      ,_sent(0)
+      ,_ack(0)
+      ,_acked(0)
+    {
+      _opcode = opcode & 0x07;
+      _mask = mask;
+      _data = (uint8_t*)malloc(_len+1);
+      if(_data == NULL){
+        _len = 0;
+        _status = WS_MSG_ERROR;
+      } else {
+        _status = WS_MSG_SENDING;
+        memcpy(_data, data, _len);
+        _data[_len] = 0;
+      }
+    }
+    virtual ~AsyncWebSocketBasicMessage(){
+      if(_data != NULL)
+        free(_data);
+    }
+    virtual bool betweenFrames(){ return _acked == _ack; }
+    virtual void ack(size_t len, uint32_t time){
+      _acked += len;
+      if(_sent == _len && _acked == _ack){
+        _status = WS_MSG_SENT;
+      }
+    }
+    virtual size_t send(AsyncClient *client){
+      if(_status != WS_MSG_SENDING)
+        return 0;
+      if(_acked < _ack){
+        return 0;
+      }
+      if(_sent == _len){
+        if(_acked == _ack)
+          _status = WS_MSG_SENT;
+        return 0;
+      }
+      size_t window = webSocketSendFrameWindow(client);
+      size_t toSend = _len - _sent;
+      if(window < toSend) toSend = window;
+      bool final = ((toSend + _sent) == _len);
+      size_t sent = webSocketSendFrame(client, final, (_sent == 0)?_opcode:WS_CONTINUATION, _mask, (uint8_t*)(_data+_sent), toSend);
+      _sent += sent;
+      uint8_t headLen = ((sent < 126)?2:4)+(_mask*4);
+      _ack += sent + headLen;
+      return sent;
+    }
+};
+
+
+
+
+
+/*
+ * Async WebSocket Client
+ */
+ const char * AWSC_PING_PAYLOAD = "ESPAsyncWebServer-PING";
+ const size_t AWSC_PING_PAYLOAD_LEN = 22;
+
+AsyncWebSocketClient::AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server){
+  _client = request->client();
+  _server = server;
+  _clientId = _server->_getNextId();
+  _status = WS_CONNECTED;
+  _controlQueue = NULL;
+  _messageQueue = NULL;
+  _pstate = 0;
+  _lastMessageTime = millis();
+  _keepAlivePeriod = 0;
+  next = NULL;
+  _client->onError([](void *r, AsyncClient* c, int8_t error){ ((AsyncWebSocketClient*)(r))->_onError(error); }, this);
+  _client->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ ((AsyncWebSocketClient*)(r))->_onAck(len, time); }, this);
+  _client->onDisconnect([](void *r, AsyncClient* c){ ((AsyncWebSocketClient*)(r))->_onDisconnect(); delete c; }, this);
+  _client->onTimeout([](void *r, AsyncClient* c, uint32_t time){ ((AsyncWebSocketClient*)(r))->_onTimeout(time); }, this);
+  _client->onData([](void *r, AsyncClient* c, void *buf, size_t len){ ((AsyncWebSocketClient*)(r))->_onData(buf, len); }, this);
+  _client->onPoll([](void *r, AsyncClient* c){ ((AsyncWebSocketClient*)(r))->_onPoll(); }, this);
+  _server->_addClient(this);
+  _server->_handleEvent(this, WS_EVT_CONNECT, NULL, NULL, 0);
+  delete request;
+}
+
+AsyncWebSocketClient::~AsyncWebSocketClient(){
+  while(_messageQueue != NULL){
+    AsyncWebSocketMessage * m = _messageQueue;
+    _messageQueue = _messageQueue->next;
+    delete(m);
+  }
+  while(_controlQueue != NULL){
+    AsyncWebSocketControl * c = _controlQueue;
+    _controlQueue = _controlQueue->next;
+    delete(c);
+  }
+  _server->_handleEvent(this, WS_EVT_DISCONNECT, NULL, NULL, 0);
+}
+
+void AsyncWebSocketClient::_onAck(size_t len, uint32_t time){
+  _lastMessageTime = millis();
+  if(_controlQueue != NULL){
+    AsyncWebSocketControl *controlMessage = _controlQueue;
+    if(controlMessage->finished()){
+      _controlQueue = _controlQueue->next;
+      len -= controlMessage->len();
+      if(_status == WS_DISCONNECTING && controlMessage->opcode() == WS_DISCONNECT){
+        delete controlMessage;
+        _status = WS_DISCONNECTED;
+        _client->close(true);
+        return;
+      }
+      delete controlMessage;
+    }
+  }
+  if(len && _messageQueue != NULL){
+    _messageQueue->ack(len, time);
+  }
+  _runQueue();
+}
+
+void AsyncWebSocketClient::_onPoll(){
+  if(_client->canSend() && (_controlQueue != NULL || _messageQueue != NULL)){
+    _runQueue();
+  } else if(_keepAlivePeriod > 0 && _controlQueue == NULL && _messageQueue == NULL && (millis() - _lastMessageTime) >= _keepAlivePeriod){
+    ping((uint8_t *)AWSC_PING_PAYLOAD, AWSC_PING_PAYLOAD_LEN);
+  }
+}
+
+void AsyncWebSocketClient::_runQueue(){
+  while(_messageQueue != NULL && _messageQueue->finished()){
+    AsyncWebSocketMessage * m = _messageQueue;
+    _messageQueue = _messageQueue->next;
+    delete(m);
+  }
+
+  if(_controlQueue != NULL && (_messageQueue == NULL || _messageQueue->betweenFrames()) && webSocketSendFrameWindow(_client) > (size_t)(_controlQueue->len() - 1)){
+    AsyncWebSocketControl *control = _controlQueue;
+    control->send(_client);
+  } else if(_messageQueue != NULL && _messageQueue->betweenFrames() && webSocketSendFrameWindow(_client)){
+    _messageQueue->send(_client);
+  }
+}
+
+void AsyncWebSocketClient::_queueMessage(AsyncWebSocketMessage *dataMessage){
+  if(dataMessage == NULL)
+    return;
+  if(_status != WS_CONNECTED){
+    delete dataMessage;
+    return;
+  }
+  if(_messageQueue == NULL){
+    _messageQueue = dataMessage;
+  } else {
+    AsyncWebSocketMessage * m = _messageQueue;
+    while(m->next != NULL) m = m->next;
+    m->next = dataMessage;
+  }
+  if(_client->canSend())
+    _runQueue();
+}
+
+void AsyncWebSocketClient::_queueControl(AsyncWebSocketControl *controlMessage){
+  if(controlMessage == NULL)
+    return;
+  if(_controlQueue == NULL){
+    _controlQueue = controlMessage;
+  } else {
+    AsyncWebSocketControl * m = _controlQueue;
+    while(m->next != NULL) m = m->next;
+    m->next = controlMessage;
+  }
+  if(_client->canSend())
+    _runQueue();
+}
+
+void AsyncWebSocketClient::close(uint16_t code, const char * message){
+  if(_status != WS_CONNECTED)
+    return;
+  if(code){
+    uint8_t packetLen = 2;
+    if(message != NULL){
+      size_t mlen = strlen(message);
+      if(mlen > 123) mlen = 123;
+      packetLen += mlen;
+    }
+    char * buf = (char*)malloc(packetLen);
+    if(buf != NULL){
+      buf[0] = (uint8_t)(code >> 8);
+      buf[1] = (uint8_t)(code & 0xFF);
+      if(message != NULL){
+        memcpy(buf+2, message, packetLen -2);
+      }
+      _queueControl(new AsyncWebSocketControl(WS_DISCONNECT,(uint8_t*)buf,packetLen));
+      free(buf);
+      return;
+    }
+  }
+  _queueControl(new AsyncWebSocketControl(WS_DISCONNECT));
+}
+
+void AsyncWebSocketClient::ping(uint8_t *data, size_t len){
+  if(_status == WS_CONNECTED)
+    _queueControl(new AsyncWebSocketControl(WS_PING, data, len));
+}
+
+void AsyncWebSocketClient::_onError(int8_t){}
+
+void AsyncWebSocketClient::_onTimeout(uint32_t time){
+  _client->close(true);
+}
+
+void AsyncWebSocketClient::_onDisconnect(){
+  _client = NULL;
+  _server->_handleDisconnect(this);
+}
+
+void AsyncWebSocketClient::_onData(void *buf, size_t plen){
+  _lastMessageTime = millis();
+  uint8_t *fdata = (uint8_t*)buf;
+  uint8_t * data = fdata;
+  if(!_pstate){
+    _pinfo.index = 0;
+    _pinfo.final = (fdata[0] & 0x80) != 0;
+    _pinfo.opcode = fdata[0] & 0x0F;
+    _pinfo.masked = (fdata[1] & 0x80) != 0;
+    _pinfo.len = fdata[1] & 0x7F;
+    data += 2;
+    plen = plen - 2;
+    if(_pinfo.len == 126){
+      _pinfo.len = fdata[3] | (uint16_t)(fdata[2]) << 8;
+      data += 2;
+      plen = plen - 2;
+    } else if(_pinfo.len == 127){
+      _pinfo.len = fdata[9] | (uint16_t)(fdata[8]) << 8 | (uint32_t)(fdata[7]) << 16 | (uint32_t)(fdata[6]) << 24 | (uint64_t)(fdata[5]) << 32 | (uint64_t)(fdata[4]) << 40 | (uint64_t)(fdata[3]) << 48 | (uint64_t)(fdata[2]) << 56;
+      data += 8;
+      plen = plen - 8;
+    }
+
+    if(_pinfo.masked){
+      memcpy(_pinfo.mask, data, 4);
+      data += 4;
+      plen = plen - 4;
+      size_t i;
+      for(i=0;i<plen;i++)
+        data[i] = data[i] ^ _pinfo.mask[(_pinfo.index+i)%4];
+    }
+  } else {
+    if(_pinfo.masked){
+      size_t i;
+      for(i=0;i<plen;i++)
+        data[i] = data[i] ^ _pinfo.mask[(_pinfo.index+i)%4];
+    }
+  }
+  if((plen + _pinfo.index) < _pinfo.len){
+    _pstate = 1;
+
+    if(_pinfo.index == 0){
+      if(_pinfo.opcode){
+        _pinfo.message_opcode = _pinfo.opcode;
+        _pinfo.num = 0;
+      } else _pinfo.num += 1;
+    }
+    _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, (uint8_t*)data, plen);
+
+    _pinfo.index += plen;
+  } else if((plen + _pinfo.index) == _pinfo.len){
+    _pstate = 0;
+    if(_pinfo.opcode == WS_DISCONNECT){
+      if(plen){
+        uint16_t reasonCode = (uint16_t)(data[0] << 8) + data[1];
+        char * reasonString = (char*)(data+2);
+        if(reasonCode > 1001){
+          _server->_handleEvent(this, WS_EVT_ERROR, (void *)&reasonCode, (uint8_t*)reasonString, strlen(reasonString));
+        }
+      }
+      if(_status == WS_DISCONNECTING){
+        _status = WS_DISCONNECTED;
+        _client->close(true);
+      } else {
+        _status = WS_DISCONNECTING;
+        _queueControl(new AsyncWebSocketControl(WS_DISCONNECT, data, plen));
+      }
+    } else if(_pinfo.opcode == WS_PING){
+      _queueControl(new AsyncWebSocketControl(WS_PONG, data, plen));
+    } else if(_pinfo.opcode == WS_PONG){
+      if(plen != AWSC_PING_PAYLOAD_LEN || memcmp(AWSC_PING_PAYLOAD, data, AWSC_PING_PAYLOAD_LEN) != 0)
+        _server->_handleEvent(this, WS_EVT_PONG, NULL, (uint8_t*)data, plen);
+    } else if(_pinfo.opcode < 8){//continuation or text/binary frame
+      _server->_handleEvent(this, WS_EVT_DATA, (void *)&_pinfo, (uint8_t*)data, plen);
+    }
+  } else {
+    //os_printf("frame error: len: %u, index: %llu, total: %llu\n", plen, _pinfo.index, _pinfo.len);
+    //what should we do?
+  }
+}
+
+size_t AsyncWebSocketClient::printf(const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char* temp = new char[64];
+  if(!temp){
+    return 0;
+  }
+  char* buffer = temp;
+  size_t len = vsnprintf(temp, 64, format, arg);
+  va_end(arg);
+  if (len > 63) {
+    buffer = new char[len + 1];
+    if (!buffer) {
+      return 0;
+    }
+    va_start(arg, format);
+    vsnprintf(buffer, len + 1, format, arg);
+    va_end(arg);
+  }
+  text(buffer, len);
+  if (buffer != temp) {
+    delete[] buffer;
+  }
+  delete[] temp;
+  return len;
+}
+
+size_t AsyncWebSocketClient::printf_P(PGM_P formatP, ...) {
+  va_list arg;
+  va_start(arg, formatP);
+  char* temp = new char[64];
+  if(!temp){
+    return 0;
+  }
+  char* buffer = temp;
+  size_t len = vsnprintf_P(temp, 64, formatP, arg);
+  va_end(arg);
+  if (len > 63) {
+    buffer = new char[len + 1];
+    if (!buffer) {
+      return 0;
+    }
+    va_start(arg, formatP);
+    vsnprintf_P(buffer, len + 1, formatP, arg);
+    va_end(arg);
+  }
+  text(buffer, len);
+  if (buffer != temp) {
+    delete[] buffer;
+  }
+  delete[] temp;
+  return len;
+}
+
+void AsyncWebSocketClient::text(const char * message, size_t len){
+  _queueMessage(new AsyncWebSocketBasicMessage(message, len));
+}
+void AsyncWebSocketClient::text(const char * message){
+  text(message, strlen(message));
+}
+void AsyncWebSocketClient::text(uint8_t * message, size_t len){
+  text((const char *)message, len);
+}
+void AsyncWebSocketClient::text(char * message){
+  text(message, strlen(message));
+}
+void AsyncWebSocketClient::text(const String &message){
+  text(message.c_str(), message.length());
+}
+void AsyncWebSocketClient::text(const __FlashStringHelper *data){
+  PGM_P p = reinterpret_cast<PGM_P>(data);
+  size_t n = 0;
+  while (1) {
+    if (pgm_read_byte(p+n) == 0) break;
+      n += 1;
+  }
+  char * message = (char*) malloc(n+1);
+  if(message){
+    for(size_t b=0; b<n; b++)
+      message[b] = pgm_read_byte(p++);
+    message[n] = 0;
+    text(message, n);
+  }
+}
+
+void AsyncWebSocketClient::binary(const char * message, size_t len){
+  _queueMessage(new AsyncWebSocketBasicMessage(message, len, WS_BINARY));
+}
+void AsyncWebSocketClient::binary(const char * message){
+  binary(message, strlen(message));
+}
+void AsyncWebSocketClient::binary(uint8_t * message, size_t len){
+  binary((const char *)message, len);
+}
+void AsyncWebSocketClient::binary(char * message){
+  binary(message, strlen(message));
+}
+void AsyncWebSocketClient::binary(const String &message){
+  binary(message.c_str(), message.length());
+}
+void AsyncWebSocketClient::binary(const __FlashStringHelper *data, size_t len){
+  PGM_P p = reinterpret_cast<PGM_P>(data);
+  char * message = (char*) malloc(len);
+  if(message){
+    for(size_t b=0; b<len; b++)
+      message[b] = pgm_read_byte(p++);
+    binary(message, len);
+  }
+}
+
+IPAddress AsyncWebSocketClient::remoteIP() {
+    if(!_client) {
+        return IPAddress(0U);
+    }
+    return _client->remoteIP();
+}
+
+uint16_t AsyncWebSocketClient::remotePort() {
+    if(!_client) {
+        return 0;
+    }
+    return _client->remotePort();
+}
+
+
+
+/*
+ * Async Web Socket - Each separate socket location
+ */
+
+AsyncWebSocket::AsyncWebSocket(String url)
+  :_url(url)
+  ,_clients(NULL)
+  ,_cNextId(1)
+  ,_enabled(true)
+{
+  _eventHandler = NULL;
+}
+
+AsyncWebSocket::~AsyncWebSocket(){}
+
+void AsyncWebSocket::_handleEvent(AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len){
+  if(_eventHandler != NULL){
+    _eventHandler(this, client, type, arg, data, len);
+  }
+}
+
+void AsyncWebSocket::_addClient(AsyncWebSocketClient * client){
+  if(_clients == NULL){
+    _clients = client;
+    return;
+  }
+  AsyncWebSocketClient * c = _clients;
+  while(c->next != NULL) c = c->next;
+  c->next = client;
+}
+
+void AsyncWebSocket::_handleDisconnect(AsyncWebSocketClient * client){
+  if(_clients == NULL){
+    return;
+  }
+  if(_clients->id() == client->id()){
+    _clients = client->next;
+    delete client;
+    return;
+  }
+  AsyncWebSocketClient * c = _clients;
+  while(c->next != NULL && c->next->id() != client->id()) c = c->next;
+  if(c->next == NULL){
+    return;
+  }
+  c->next = client->next;
+  delete client;
+}
+
+size_t AsyncWebSocket::count(){
+  size_t i = 0;
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      i++;
+    c = c->next;
+  }
+  return i;
+}
+
+AsyncWebSocketClient * AsyncWebSocket::client(uint32_t id){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL && c->id() != id)
+    c = c->next;
+  if(c != NULL && c->status() == WS_CONNECTED)
+    return c;
+  return NULL;
+}
+
+
+void AsyncWebSocket::close(uint32_t id, uint16_t code, const char * message){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL)
+    c->close(code, message);
+}
+
+void AsyncWebSocket::closeAll(uint16_t code, const char * message){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      c->close(code, message);
+    c = c->next;
+  }
+}
+
+void AsyncWebSocket::ping(uint32_t id, uint8_t *data, size_t len){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL)
+    c->ping(data, len);
+}
+
+void AsyncWebSocket::pingAll(uint8_t *data, size_t len){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      c->ping(data, len);
+    c = c->next;
+  }
+
+}
+
+void AsyncWebSocket::text(uint32_t id, const char * message, size_t len){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL)
+    c->text(message, len);
+}
+
+void AsyncWebSocket::textAll(const char * message, size_t len){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      c->text(message, len);
+    c = c->next;
+  }
+}
+
+void AsyncWebSocket::binary(uint32_t id, const char * message, size_t len){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL)
+    c->binary(message, len);
+}
+
+void AsyncWebSocket::binaryAll(const char * message, size_t len){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      c->binary(message, len);
+    c = c->next;
+  }
+}
+
+void AsyncWebSocket::message(uint32_t id, AsyncWebSocketMessage *message){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL)
+    c->message(message);
+}
+
+void AsyncWebSocket::messageAll(AsyncWebSocketMessage *message){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      c->message(message);
+    c = c->next;
+  }
+}
+
+size_t AsyncWebSocket::printf(uint32_t id, const char *format, ...){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL){
+    va_list arg;
+    va_start(arg, format);
+    size_t len = c->printf(format, arg);
+    va_end(arg);
+    return len;
+  }
+  return 0;
+}
+
+size_t AsyncWebSocket::printfAll(const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char* temp = new char[64];
+  if(!temp){
+    return 0;
+  }
+  char* buffer = temp;
+  size_t len = vsnprintf(temp, 64, format, arg);
+  va_end(arg);
+  if (len > 63) {
+    buffer = new char[len + 1];
+    if (!buffer) {
+      return 0;
+    }
+    va_start(arg, format);
+    vsnprintf(buffer, len + 1, format, arg);
+    va_end(arg);
+  }
+  textAll(buffer, len);
+  if (buffer != temp) {
+    delete[] buffer;
+  }
+  delete[] temp;
+  return len;
+}
+
+size_t AsyncWebSocket::printf_P(uint32_t id, PGM_P formatP, ...){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL){
+    va_list arg;
+    va_start(arg, formatP);
+    size_t len = c->printf_P(formatP, arg);
+    va_end(arg);
+    return len;
+  }
+  return 0;
+}
+
+size_t AsyncWebSocket::printfAll_P(PGM_P formatP, ...) {
+  va_list arg;
+  va_start(arg, formatP);
+  char* temp = new char[64];
+  if(!temp){
+    return 0;
+  }
+  char* buffer = temp;
+  size_t len = vsnprintf_P(temp, 64, formatP, arg);
+  va_end(arg);
+  if (len > 63) {
+    buffer = new char[len + 1];
+    if (!buffer) {
+      return 0;
+    }
+    va_start(arg, formatP);
+    vsnprintf_P(buffer, len + 1, formatP, arg);
+    va_end(arg);
+  }
+  textAll(buffer, len);
+  if (buffer != temp) {
+    delete[] buffer;
+  }
+  delete[] temp;
+  return len;
+}
+
+void AsyncWebSocket::text(uint32_t id, const char * message){
+  text(id, message, strlen(message));
+}
+void AsyncWebSocket::text(uint32_t id, uint8_t * message, size_t len){
+  text(id, (const char *)message, len);
+}
+void AsyncWebSocket::text(uint32_t id, char * message){
+  text(id, message, strlen(message));
+}
+void AsyncWebSocket::text(uint32_t id, const String &message){
+  text(id, message.c_str(), message.length());
+}
+void AsyncWebSocket::text(uint32_t id, const __FlashStringHelper *message){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL)
+    c->text(message);
+}
+void AsyncWebSocket::textAll(const char * message){
+  textAll(message, strlen(message));
+}
+void AsyncWebSocket::textAll(uint8_t * message, size_t len){
+  textAll((const char *)message, len);
+}
+void AsyncWebSocket::textAll(char * message){
+  textAll(message, strlen(message));
+}
+void AsyncWebSocket::textAll(const String &message){
+  textAll(message.c_str(), message.length());
+}
+void AsyncWebSocket::textAll(const __FlashStringHelper *message){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      c->text(message);
+    c = c->next;
+  }
+}
+void AsyncWebSocket::binary(uint32_t id, const char * message){
+  binary(id, message, strlen(message));
+}
+void AsyncWebSocket::binary(uint32_t id, uint8_t * message, size_t len){
+  binary(id, (const char *)message, len);
+}
+void AsyncWebSocket::binary(uint32_t id, char * message){
+  binary(id, message, strlen(message));
+}
+void AsyncWebSocket::binary(uint32_t id, const String &message){
+  binary(id, message.c_str(), message.length());
+}
+void AsyncWebSocket::binary(uint32_t id, const __FlashStringHelper *message, size_t len){
+  AsyncWebSocketClient * c = client(id);
+  if(c != NULL)
+    c-> binary(message, len);
+}
+void AsyncWebSocket::binaryAll(const char * message){
+  binaryAll(message, strlen(message));
+}
+void AsyncWebSocket::binaryAll(uint8_t * message, size_t len){
+  binaryAll((const char *)message, len);
+}
+void AsyncWebSocket::binaryAll(char * message){
+  binaryAll(message, strlen(message));
+}
+void AsyncWebSocket::binaryAll(const String &message){
+  binaryAll(message.c_str(), message.length());
+}
+void AsyncWebSocket::binaryAll(const __FlashStringHelper *message, size_t len){
+  AsyncWebSocketClient * c = _clients;
+  while(c != NULL){
+    if(c->status() == WS_CONNECTED)
+      c-> binary(message, len);
+    c = c->next;
+  }
+ }
+
+const char * WS_STR_CONNECTION = "Connection";
+const char * WS_STR_UPGRADE = "Upgrade";
+const char * WS_STR_ORIGIN = "Origin";
+const char * WS_STR_VERSION = "Sec-WebSocket-Version";
+const char * WS_STR_KEY = "Sec-WebSocket-Key";
+const char * WS_STR_PROTOCOL = "Sec-WebSocket-Protocol";
+const char * WS_STR_ACCEPT = "Sec-WebSocket-Accept";
+const char * WS_STR_UUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+
+bool AsyncWebSocket::canHandle(AsyncWebServerRequest *request){
+  if(!_enabled)
+    return false;
+
+  if(request->method() != HTTP_GET || !request->url().equals(_url))
+    return false;
+
+  request->addInterestingHeader(WS_STR_CONNECTION);
+  request->addInterestingHeader(WS_STR_UPGRADE);
+  request->addInterestingHeader(WS_STR_ORIGIN);
+  request->addInterestingHeader(WS_STR_VERSION);
+  request->addInterestingHeader(WS_STR_KEY);
+  request->addInterestingHeader(WS_STR_PROTOCOL);
+  return true;
+}
+
+void AsyncWebSocket::handleRequest(AsyncWebServerRequest *request){
+  if(!request->hasHeader(WS_STR_VERSION) || !request->hasHeader(WS_STR_KEY)){
+    request->send(400);
+    return;
+  }
+  AsyncWebHeader* version = request->getHeader(WS_STR_VERSION);
+  if(version->value().toInt() != 13){
+    AsyncWebServerResponse *response = request->beginResponse(400);
+    response->addHeader(WS_STR_VERSION,"13");
+    request->send(response);
+    return;
+  }
+  AsyncWebHeader* key = request->getHeader(WS_STR_KEY);
+  AsyncWebServerResponse *response = new AsyncWebSocketResponse(key->value(), this);
+  if(request->hasHeader(WS_STR_PROTOCOL)){
+    AsyncWebHeader* protocol = request->getHeader(WS_STR_PROTOCOL);
+    //ToDo: check protocol
+    response->addHeader(WS_STR_PROTOCOL, protocol->value());
+  }
+  request->send(response);
+}
+
+
+/*
+ * Response to Web Socket request - sends the authorization and detaches the TCP Client from the web server
+ * Authentication code from https://github.com/Links2004/arduinoWebSockets/blob/master/src/WebSockets.cpp#L480
+ */
+
+AsyncWebSocketResponse::AsyncWebSocketResponse(String key, AsyncWebSocket *server){
+  _server = server;
+  _code = 101;
+  uint8_t * hash = (uint8_t*)malloc(20);
+  if(hash == NULL){
+    _state = RESPONSE_FAILED;
+    return;
+  }
+  char * buffer = (char *) malloc(33);
+  if(buffer == NULL){
+    free(hash);
+    _state = RESPONSE_FAILED;
+    return;
+  }
+#ifdef ESP8266
+  sha1(key + WS_STR_UUID, hash);
+#else
+  key += WS_STR_UUID;
+  SHA1_CTX ctx;
+  SHA1Init(&ctx);
+  SHA1Update(&ctx, (const unsigned char*)key.c_str(), key.length());
+  SHA1Final(hash, &ctx);
+#endif
+  base64_encodestate _state;
+  base64_init_encodestate(&_state);
+  int len = base64_encode_block((const char *) hash, 20, buffer, &_state);
+  len = base64_encode_blockend((buffer + len), &_state);
+  addHeader(WS_STR_CONNECTION, WS_STR_UPGRADE);
+  addHeader(WS_STR_UPGRADE, "websocket");
+  addHeader(WS_STR_ACCEPT,buffer);
+  free(buffer);
+  free(hash);
+}
+
+void AsyncWebSocketResponse::_respond(AsyncWebServerRequest *request){
+  if(_state == RESPONSE_FAILED){
+    request->client()->close(true);
+    return;
+  }
+  String out = _assembleHead(request->version());
+  request->client()->write(out.c_str(), _headLength);
+  _state = RESPONSE_WAIT_ACK;
+}
+
+size_t AsyncWebSocketResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+  if(len){
+    new AsyncWebSocketClient(request, _server);
+  }
+  return 0;
+}
diff --git a/libraries/ESPAsyncWebServer-master/src/AsyncWebSocket.h b/libraries/ESPAsyncWebServer-master/src/AsyncWebSocket.h
new file mode 100644
index 0000000..d5b06a5
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/AsyncWebSocket.h
@@ -0,0 +1,229 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef ASYNCWEBSOCKET_H_
+#define ASYNCWEBSOCKET_H_
+
+#include <Arduino.h>
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncWebServer.h>
+
+class AsyncWebSocket;
+class AsyncWebSocketResponse;
+class AsyncWebSocketClient;
+class AsyncWebSocketControl;
+
+typedef struct {
+    uint8_t message_opcode;
+    uint32_t num;
+    uint8_t final;
+    uint8_t masked;
+    uint8_t opcode;
+    uint64_t len;
+    uint8_t mask[4];
+    uint64_t index;
+} AwsFrameInfo;
+
+typedef enum { WS_DISCONNECTED, WS_CONNECTED, WS_DISCONNECTING } AwsClientStatus;
+typedef enum { WS_CONTINUATION, WS_TEXT, WS_BINARY, WS_DISCONNECT = 0x08, WS_PING, WS_PONG } AwsFrameType;
+typedef enum { WS_MSG_SENDING, WS_MSG_SENT, WS_MSG_ERROR } AwsMessageStatus;
+typedef enum { WS_EVT_CONNECT, WS_EVT_DISCONNECT, WS_EVT_PONG, WS_EVT_ERROR, WS_EVT_DATA } AwsEventType;
+
+class AsyncWebSocketMessage {
+  protected:
+    uint8_t _opcode;
+    bool _mask;
+    AwsMessageStatus _status;
+  public:
+    AsyncWebSocketMessage * next;
+    AsyncWebSocketMessage():_opcode(WS_TEXT),_mask(false),_status(WS_MSG_ERROR),next(NULL){}
+    virtual ~AsyncWebSocketMessage(){}
+    virtual void ack(size_t len, uint32_t time){}
+    virtual size_t send(AsyncClient *client){ return 0; }
+    virtual bool finished(){ return _status != WS_MSG_SENDING; }
+    virtual bool betweenFrames(){ return false; }
+};
+
+class AsyncWebSocketClient {
+  private:
+    AsyncClient *_client;
+    AsyncWebSocket *_server;
+    uint32_t _clientId;
+    AwsClientStatus _status;
+
+    AsyncWebSocketControl * _controlQueue;
+    AsyncWebSocketMessage * _messageQueue;
+
+    uint8_t _pstate;
+    AwsFrameInfo _pinfo;
+
+    uint32_t _lastMessageTime;
+    uint32_t _keepAlivePeriod;
+
+    void _queueMessage(AsyncWebSocketMessage *dataMessage);
+    void _queueControl(AsyncWebSocketControl *controlMessage);
+    void _runQueue();
+
+  public:
+    AsyncWebSocketClient * next;
+
+    AsyncWebSocketClient(AsyncWebServerRequest *request, AsyncWebSocket *server);
+    ~AsyncWebSocketClient();
+
+    //client id increments for the given server
+    uint32_t id(){ return _clientId; }
+    AwsClientStatus status(){ return _status; }
+    AsyncClient* client(){ return _client; }
+
+    IPAddress remoteIP();
+    uint16_t  remotePort();
+
+    //control frames
+    void close(uint16_t code=0, const char * message=NULL);
+    void ping(uint8_t *data=NULL, size_t len=0);
+
+    //set auto-ping period in seconds. disabled if zero (default)
+    void keepAlivePeriod(uint16_t seconds){
+      _keepAlivePeriod = seconds * 1000;
+    }
+    uint16_t keepAlivePeriod(){
+      return (uint16_t)(_keepAlivePeriod / 1000);
+    }
+
+    //data packets
+    void message(AsyncWebSocketMessage *message){ _queueMessage(message); }
+
+    size_t printf(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
+    size_t printf_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
+
+    void text(const char * message, size_t len);
+    void text(const char * message);
+    void text(uint8_t * message, size_t len);
+    void text(char * message);
+    void text(const String &message);
+    void text(const __FlashStringHelper *data);
+
+    void binary(const char * message, size_t len);
+    void binary(const char * message);
+    void binary(uint8_t * message, size_t len);
+    void binary(char * message);
+    void binary(const String &message);
+    void binary(const __FlashStringHelper *data, size_t len);
+
+    //system callbacks (do not call)
+    void _onAck(size_t len, uint32_t time);
+    void _onError(int8_t);
+    void _onPoll();
+    void _onTimeout(uint32_t time);
+    void _onDisconnect();
+    void _onData(void *buf, size_t plen);
+};
+
+typedef std::function<void(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)> AwsEventHandler;
+
+//WebServer Handler implementation that plays the role of a socket server
+class AsyncWebSocket: public AsyncWebHandler {
+  private:
+    String _url;
+    AsyncWebSocketClient * _clients;
+    uint32_t _cNextId;
+    AwsEventHandler _eventHandler;
+    bool _enabled;
+  public:
+    AsyncWebSocket(String url);
+    ~AsyncWebSocket();
+    const char * url(){ return _url.c_str(); }
+    void enable(bool e){ _enabled = e; }
+    bool enabled() { return _enabled; }
+
+    size_t count();
+    AsyncWebSocketClient * client(uint32_t id);
+    bool hasClient(uint32_t id){ return client(id) != NULL; }
+
+    void close(uint32_t id, uint16_t code=0, const char * message=NULL);
+    void closeAll(uint16_t code=0, const char * message=NULL);
+
+    void ping(uint32_t id, uint8_t *data=NULL, size_t len=0);
+    void pingAll(uint8_t *data=NULL, size_t len=0);
+
+    void text(uint32_t id, const char * message, size_t len);
+    void text(uint32_t id, const char * message);
+    void text(uint32_t id, uint8_t * message, size_t len);
+    void text(uint32_t id, char * message);
+    void text(uint32_t id, const String &message);
+    void text(uint32_t id, const __FlashStringHelper *message);
+
+    void textAll(const char * message, size_t len);
+    void textAll(const char * message);
+    void textAll(uint8_t * message, size_t len);
+    void textAll(char * message);
+    void textAll(const String &message);
+    void textAll(const __FlashStringHelper *message);
+
+    void binary(uint32_t id, const char * message, size_t len);
+    void binary(uint32_t id, const char * message);
+    void binary(uint32_t id, uint8_t * message, size_t len);
+    void binary(uint32_t id, char * message);
+    void binary(uint32_t id, const String &message);
+    void binary(uint32_t id, const __FlashStringHelper *message, size_t len);
+
+    void binaryAll(const char * message, size_t len);
+    void binaryAll(const char * message);
+    void binaryAll(uint8_t * message, size_t len);
+    void binaryAll(char * message);
+    void binaryAll(const String &message);
+    void binaryAll(const __FlashStringHelper *message, size_t len);
+
+    void message(uint32_t id, AsyncWebSocketMessage *message);
+    void messageAll(AsyncWebSocketMessage *message);
+
+    size_t printf(uint32_t id, const char *format, ...)  __attribute__ ((format (printf, 3, 4)));
+    size_t printfAll(const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
+    size_t printf_P(uint32_t id, PGM_P formatP, ...)  __attribute__ ((format (printf, 3, 4)));
+    size_t printfAll_P(PGM_P formatP, ...)  __attribute__ ((format (printf, 2, 3)));
+
+    //event listener
+    void onEvent(AwsEventHandler handler){
+      _eventHandler = handler;
+    }
+
+    //system callbacks (do not call)
+    uint32_t _getNextId(){ return _cNextId++; }
+    void _addClient(AsyncWebSocketClient * client);
+    void _handleDisconnect(AsyncWebSocketClient * client);
+    void _handleEvent(AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
+    bool canHandle(AsyncWebServerRequest *request);
+    void handleRequest(AsyncWebServerRequest *request);
+};
+
+//WebServer response to authenticate the socket and detach the tcp client from the web server request
+class AsyncWebSocketResponse: public AsyncWebServerResponse {
+  private:
+    String _content;
+    AsyncWebSocket *_server;
+  public:
+    AsyncWebSocketResponse(String key, AsyncWebSocket *server);
+    void _respond(AsyncWebServerRequest *request);
+    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+    bool _sourceValid(){ return true; }
+};
+
+
+#endif /* ASYNCWEBSOCKET_H_ */
diff --git a/libraries/ESPAsyncWebServer-master/src/ESPAsyncWebServer.h b/libraries/ESPAsyncWebServer-master/src/ESPAsyncWebServer.h
new file mode 100644
index 0000000..390af1c
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/ESPAsyncWebServer.h
@@ -0,0 +1,393 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef _ESPAsyncWebServer_H_
+#define _ESPAsyncWebServer_H_
+
+#include "Arduino.h"
+
+#include <functional>
+#include <ESPAsyncTCP.h>
+#include "FS.h"
+
+#include "StringArray.h"
+
+#if defined(ESP31B)
+#include <ESP31BWiFi.h>
+#elif defined(ESP8266)
+#include <ESP8266WiFi.h>
+#else
+#error Platform not supported
+#endif
+
+#define DEBUGF(...) //Serial.printf(__VA_ARGS__)
+
+
+class AsyncWebServer;
+class AsyncWebServerRequest;
+class AsyncWebServerResponse;
+class AsyncWebHeader;
+class AsyncWebParameter;
+class AsyncWebRewrite;
+class AsyncWebHandler;
+class AsyncStaticWebHandler;
+class AsyncCallbackWebHandler;
+class AsyncResponseStream;
+
+typedef enum {
+  HTTP_ANY, HTTP_GET, HTTP_POST, HTTP_DELETE, HTTP_PUT, HTTP_PATCH, HTTP_HEAD, HTTP_OPTIONS
+} WebRequestMethod;
+
+/*
+ * PARAMETER :: Chainable object to hold GET/POST and FILE parameters
+ * */
+
+class AsyncWebParameter {
+  private:
+    String _name;
+    String _value;
+    size_t _size;
+    bool _isForm;
+    bool _isFile;
+
+  public:
+    AsyncWebParameter *next;
+
+    AsyncWebParameter(String name, String value, bool form=false, bool file=false, size_t size=0): _name(name), _value(value), _size(size), _isForm(form), _isFile(file), next(NULL){}
+    String name(){ return _name; }
+    String value(){ return _value; }
+    size_t size(){ return _size; }
+    bool isPost(){ return _isForm; }
+    bool isFile(){ return _isFile; }
+};
+
+/*
+ * HEADER :: Chainable object to hold the headers
+ * */
+
+class AsyncWebHeader {
+  private:
+    String _name;
+    String _value;
+
+  public:
+    AsyncWebHeader *next;
+
+    AsyncWebHeader(String name, String value): _name(name), _value(value), next(NULL){}
+    AsyncWebHeader(String data): _name(), _value(), next(NULL){
+      if(!data) return;
+      int index = data.indexOf(':');
+      if (index < 0) return;
+      _name = data.substring(0, index);
+      _value = data.substring(index + 2);
+    }
+    ~AsyncWebHeader(){}
+    String name(){ return _name; }
+    String value(){ return _value; }
+    String toString(){ return String(_name+": "+_value+"\r\n"); }
+};
+
+/*
+ * REQUEST :: Each incoming Client is wrapped inside a Request and both live together until disconnect
+ * */
+
+typedef std::function<size_t(uint8_t*, size_t, size_t)> AwsResponseFiller;
+
+class AsyncWebServerRequest {
+  friend class AsyncWebServer;
+  private:
+    AsyncClient* _client;
+    AsyncWebServer* _server;
+    AsyncWebHandler* _handler;
+    AsyncWebServerResponse* _response;
+    StringArray* _interestingHeaders;
+
+    String _temp;
+    uint8_t _parseState;
+
+    uint8_t _version;
+    WebRequestMethod _method;
+    String _url;
+    String _host;
+    String _contentType;
+    String _boundary;
+    String _authorization;
+    bool _isDigest;
+    bool _isMultipart;
+    bool _isPlainPost;
+    bool _expectingContinue;
+    size_t _contentLength;
+    size_t _parsedLength;
+
+    AsyncWebHeader *_headers;
+    AsyncWebParameter *_params;
+
+    uint8_t _multiParseState;
+    uint8_t _boundaryPosition;
+    size_t _itemStartIndex;
+    size_t _itemSize;
+    String _itemName;
+    String _itemFilename;
+    String _itemType;
+    String _itemValue;
+    uint8_t *_itemBuffer;
+    size_t _itemBufferIndex;
+    bool _itemIsFile;
+
+    void _onPoll();
+    void _onAck(size_t len, uint32_t time);
+    void _onError(int8_t error);
+    void _onTimeout(uint32_t time);
+    void _onDisconnect();
+    void _onData(void *buf, size_t len);
+
+    void _addParam(AsyncWebParameter*);
+
+    bool _parseReqHead();
+    bool _parseReqHeader();
+    void _parseLine();
+    void _parsePlainPostChar(uint8_t data);
+    void _parseMultipartPostByte(uint8_t data, bool last);
+    void _addGetParams(String params);
+
+    void _handleUploadStart();
+    void _handleUploadByte(uint8_t data, bool last);
+    void _handleUploadEnd();
+
+  public:
+    File _tempFile;
+    void *_tempObject;
+    AsyncWebServerRequest *next;
+
+    AsyncWebServerRequest(AsyncWebServer*, AsyncClient*);
+    ~AsyncWebServerRequest();
+
+    AsyncClient* client(){ return _client; }
+    uint8_t version(){ return _version; }
+    WebRequestMethod method(){ return _method; }
+    String url(){ return _url; }
+    String host(){ return _host; }
+    String contentType(){ return _contentType; }
+    size_t contentLength(){ return _contentLength; }
+    bool multipart(){ return _isMultipart; }
+    const char * methodToString();
+
+
+    //hash is the string representation of:
+    // base64(user:pass) for basic or
+    // user:realm:md5(user:realm:pass) for digest
+    bool authenticate(const char * hash);
+    bool authenticate(const char * username, const char * password, const char * realm = NULL, bool passwordIsHash = false);
+    void requestAuthentication(const char * realm = NULL, bool isDigest = true);
+
+    void setHandler(AsyncWebHandler *handler){ _handler = handler; }
+    void addInterestingHeader(String name);
+
+    void redirect(String url);
+
+    void send(AsyncWebServerResponse *response);
+    void send(int code, String contentType=String(), String content=String());
+    void send(FS &fs, String path, String contentType=String(), bool download=false);
+    void send(File content, String path, String contentType=String(), bool download=false);
+    void send(Stream &stream, String contentType, size_t len);
+    void send(String contentType, size_t len, AwsResponseFiller callback);
+    void sendChunked(String contentType, AwsResponseFiller callback);
+    void send_P(int code, String contentType, const uint8_t * content, size_t len);
+    void send_P(int code, String contentType, PGM_P content);
+
+    AsyncWebServerResponse *beginResponse(int code, String contentType=String(), String content=String());
+    AsyncWebServerResponse *beginResponse(FS &fs, String path, String contentType=String(), bool download=false);
+    AsyncWebServerResponse *beginResponse(File content, String path, String contentType=String(), bool download=false);
+    AsyncWebServerResponse *beginResponse(Stream &stream, String contentType, size_t len);
+    AsyncWebServerResponse *beginResponse(String contentType, size_t len, AwsResponseFiller callback);
+    AsyncWebServerResponse *beginChunkedResponse(String contentType, AwsResponseFiller callback);
+    AsyncResponseStream *beginResponseStream(String contentType, size_t bufferSize=1460);
+    AsyncWebServerResponse *beginResponse_P(int code, String contentType, const uint8_t * content, size_t len);
+    AsyncWebServerResponse *beginResponse_P(int code, String contentType, PGM_P content);
+
+    int headers();                     // get header count
+    bool hasHeader(String name);
+    AsyncWebHeader* getHeader(String name);
+    AsyncWebHeader* getHeader(int num);
+
+    int params();                      // get arguments count
+    bool hasParam(String name, bool post=false, bool file=false);
+    AsyncWebParameter* getParam(String name, bool post=false, bool file=false);
+    AsyncWebParameter* getParam(int num);
+
+    int args(){ return params(); }  // get arguments count
+    String arg(const char* name);   // get request argument value by name
+    String arg(int i);              // get request argument value by number
+    String argName(int i);          // get request argument name by number
+    bool hasArg(const char* name);  // check if argument exists
+
+    String header(const char* name);   // get request header value by name
+    String header(int i);              // get request header value by number
+    String headerName(int i);          // get request header name by number
+    bool hasHeader(const char* name);  // check if header exists
+
+    String urlDecode(const String& text);
+};
+
+/*
+ * FILTER :: Callback to filter AsyncWebRewrite and AsyncWebHandler (done by the Server)
+ * */
+
+typedef std::function<bool(AsyncWebServerRequest *request)> ArRequestFilterFunction;
+
+static bool ON_STA_FILTER(AsyncWebServerRequest *request) {
+  return WiFi.localIP() == request->client()->localIP();
+}
+
+static bool ON_AP_FILTER(AsyncWebServerRequest *request) {
+  return WiFi.localIP() != request->client()->localIP();
+}
+
+/*
+ * REWRITE :: One instance can be handle any Request (done by the Server)
+ * */
+
+class AsyncWebRewrite {
+  protected:
+    String _from;
+    String _toUrl;
+    String _params;
+    ArRequestFilterFunction _filter;
+  public:
+    AsyncWebRewrite* next;
+    AsyncWebRewrite(const char* from, const char* to): _from(from), _toUrl(to), _params(String()), _filter(NULL), next(NULL){
+      int index = _toUrl.indexOf('?');
+      if (index > 0) {
+        _params = _toUrl.substring(index +1);
+        _toUrl = _toUrl.substring(0, index);
+      }
+    }
+    AsyncWebRewrite& setFilter(ArRequestFilterFunction fn) { _filter = fn; return *this; }
+    bool filter(AsyncWebServerRequest *request){ return _filter == NULL || _filter(request); }
+    String from(void) { return _from; }
+    String toUrl(void) { return _toUrl; }
+    String params(void) { return _params; }
+};
+
+/*
+ * HANDLER :: One instance can be attached to any Request (done by the Server)
+ * */
+
+class AsyncWebHandler {
+  protected:
+    ArRequestFilterFunction _filter;
+  public:
+    AsyncWebHandler* next;
+    AsyncWebHandler(): next(NULL){}
+    AsyncWebHandler& setFilter(ArRequestFilterFunction fn) { _filter = fn; return *this; }
+    bool filter(AsyncWebServerRequest *request){ return _filter == NULL || _filter(request); }
+    virtual ~AsyncWebHandler(){}
+    virtual bool canHandle(AsyncWebServerRequest *request){ return false; }
+    virtual void handleRequest(AsyncWebServerRequest *request){}
+    virtual void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){}
+    virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){}
+};
+
+/*
+ * RESPONSE :: One instance is created for each Request (attached by the Handler)
+ * */
+
+typedef enum {
+  RESPONSE_SETUP, RESPONSE_HEADERS, RESPONSE_CONTENT, RESPONSE_WAIT_ACK, RESPONSE_END, RESPONSE_FAILED
+} WebResponseState;
+
+class AsyncWebServerResponse {
+  protected:
+    int _code;
+    AsyncWebHeader *_headers;
+    String _contentType;
+    size_t _contentLength;
+    bool _sendContentLength;
+    bool _chunked;
+    size_t _headLength;
+    size_t _sentLength;
+    size_t _ackedLength;
+    WebResponseState _state;
+    const char* _responseCodeToString(int code);
+
+  public:
+    AsyncWebServerResponse();
+    virtual ~AsyncWebServerResponse();
+    virtual void setCode(int code);
+    virtual void setContentLength(size_t len);
+    virtual void setContentType(String type);
+    virtual void addHeader(String name, String value);
+    virtual String _assembleHead(uint8_t version);
+    virtual bool _started();
+    virtual bool _finished();
+    virtual bool _failed();
+    virtual bool _sourceValid();
+    virtual void _respond(AsyncWebServerRequest *request);
+    virtual size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+};
+
+/*
+ * SERVER :: One instance
+ * */
+
+typedef std::function<void(AsyncWebServerRequest *request)> ArRequestHandlerFunction;
+typedef std::function<void(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final)> ArUploadHandlerFunction;
+typedef std::function<void(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total)> ArBodyHandlerFunction;
+
+class AsyncWebServer {
+  private:
+    AsyncServer _server;
+    AsyncWebRewrite* _rewrites;
+    AsyncWebHandler* _handlers;
+    AsyncWebHandler* _catchAllHandler;
+  public:
+    AsyncWebServer(uint16_t port);
+    ~AsyncWebServer();
+
+    void begin();
+
+    AsyncWebRewrite& addRewrite(AsyncWebRewrite* rewrite);
+
+    AsyncWebRewrite& rewrite(const char* from, const char* to);
+
+    AsyncWebHandler& addHandler(AsyncWebHandler* handler);
+
+    AsyncCallbackWebHandler& on(const char* uri, ArRequestHandlerFunction onRequest);
+    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethod method, ArRequestHandlerFunction onRequest);
+    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethod method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload);
+    AsyncCallbackWebHandler& on(const char* uri, WebRequestMethod method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody);
+
+    AsyncStaticWebHandler& serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control = NULL);
+
+    void onNotFound(ArRequestHandlerFunction fn);  //called when handler is not assigned
+    void onFileUpload(ArUploadHandlerFunction fn); //handle file uploads
+    void onRequestBody(ArBodyHandlerFunction fn); //handle posts with plain body content (JSON often transmitted this way as a request)
+
+    void _handleDisconnect(AsyncWebServerRequest *request);
+    void _attachHandler(AsyncWebServerRequest *request);
+    void _rewriteRequest(AsyncWebServerRequest *request);
+};
+
+#include "WebResponseImpl.h"
+#include "WebHandlerImpl.h"
+#include "AsyncWebSocket.h"
+#include "AsyncEventSource.h"
+
+#endif /* _AsyncWebServer_H_ */
diff --git a/libraries/ESPAsyncWebServer-master/src/StringArray.h b/libraries/ESPAsyncWebServer-master/src/StringArray.h
new file mode 100644
index 0000000..204f7cf
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/StringArray.h
@@ -0,0 +1,138 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef STRINGARRAY_H_
+#define STRINGARRAY_H_
+
+#include "stddef.h"
+#include "WString.h"
+
+class StringArrayItem;
+class StringArrayItem {
+  private:
+    String _string;
+  public:
+    StringArrayItem *next;
+    StringArrayItem(String str):_string(str), next(NULL){}
+    ~StringArrayItem(){}
+    String string(){ return _string; }
+};
+
+class StringArray {
+  private:
+    StringArrayItem *_items;
+  public:
+    StringArray():_items(NULL){}
+    StringArray(StringArrayItem *items):_items(items){}
+    ~StringArray(){}
+    StringArrayItem *items(){
+      return _items;
+    }
+    void add(String str){
+      StringArrayItem *it = new StringArrayItem(str);
+      if(_items == NULL){
+        _items = it;
+      } else {
+        StringArrayItem *i = _items;
+        while(i->next != NULL) i = i->next;
+        i->next = it;
+      }
+    }
+    size_t length(){
+      size_t i = 0;
+      StringArrayItem *it = _items;
+      while(it != NULL){
+        i++;
+        it = it->next;
+      }
+      return i;
+    }
+    bool contains(String str){
+      StringArrayItem *it = _items;
+      while(it != NULL){
+        if(it->string() == str)
+          return true;
+        it = it->next;
+      }
+      return false;
+    }
+    String get(size_t index){
+      size_t i = 0;
+      StringArrayItem *it = _items;
+      while(it != NULL){
+        if(i++ == index)
+          return it->string();
+        it = it->next;
+      }
+      return String();
+    }
+    bool remove(size_t index){
+      StringArrayItem *it = _items;
+      if(!index){
+        if(_items == NULL)
+          return false;
+        _items = _items->next;
+        delete it;
+        return true;
+      }
+      size_t i = 0;
+      StringArrayItem *pit = _items;
+      while(it != NULL){
+        if(i++ == index){
+          pit->next = it->next;
+          delete it;
+          return true;
+        }
+        pit = it;
+        it = it->next;
+      }
+      return false;
+    }
+    bool remove(String str){
+      StringArrayItem *it = _items;
+      StringArrayItem *pit = _items;
+      while(it != NULL){
+        if(it->string() == str){
+          if(it == _items){
+            _items = _items->next;
+          } else {
+            pit->next = it->next;
+          }
+          delete it;
+          return true;
+        }
+        pit = it;
+        it = it->next;
+      }
+      return false;
+    }
+    void free(){
+      StringArrayItem *it;
+      while(_items != NULL){
+        it = _items;
+        _items = _items->next;
+        delete it;
+      }
+    }
+};
+
+
+
+#endif /* STRINGARRAY_H_ */
diff --git a/libraries/ESPAsyncWebServer-master/src/WebAuthentication.cpp b/libraries/ESPAsyncWebServer-master/src/WebAuthentication.cpp
new file mode 100644
index 0000000..ab15e4a
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebAuthentication.cpp
@@ -0,0 +1,218 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "WebAuthentication.h"
+#include <libb64/cencode.h>
+#include "md5.h"
+
+// Basic Auth hash = base64("username:password")
+
+bool checkBasicAuthentication(const char * hash, const char * username, const char * password){
+  if(username == NULL || password == NULL || hash == NULL)
+    return false;
+
+  size_t toencodeLen = strlen(username)+strlen(password)+1;
+  size_t encodedLen = base64_encode_expected_len(toencodeLen);
+  if(strlen(hash) != encodedLen)
+    return false;
+
+  char *toencode = new char[toencodeLen+1];
+  if(toencode == NULL){
+    return false;
+  }
+  char *encoded = new char[base64_encode_expected_len(toencodeLen)+1];
+  if(encoded == NULL){
+    delete[] toencode;
+    return false;
+  }
+  sprintf(toencode, "%s:%s", username, password);
+  if(base64_encode_chars(toencode, toencodeLen, encoded) > 0 && memcmp(hash, encoded, encodedLen) == 0){
+    delete[] toencode;
+    delete[] encoded;
+    return true;
+  }
+  delete[] toencode;
+  delete[] encoded;
+  return false;
+}
+
+static bool getMD5(uint8_t * data, uint16_t len, char * output){//33 bytes or more
+  md5_context_t _ctx;
+  uint8_t i;
+  uint8_t * _buf = (uint8_t*)malloc(16);
+  if(_buf == NULL)
+    return false;
+  memset(_buf, 0x00, 16);
+  MD5Init(&_ctx);
+  MD5Update(&_ctx, data, len);
+  MD5Final(_buf, &_ctx);
+  for(i = 0; i < 16; i++) {
+    sprintf(output + (i * 2), "%02x", _buf[i]);
+  }
+  free(_buf);
+  return true;
+}
+
+static String genRandomMD5(){
+#ifdef ESP8266
+  uint32_t r = RANDOM_REG32;
+#else
+  uint32_t r = rand();
+#endif
+  char * out = (char*)malloc(33);
+  if(out == NULL || !getMD5((uint8_t*)(&r), 4, out))
+    return "";
+  String res = String(out);
+  free(out);
+  return res;
+}
+
+static String stringMD5(String in){
+  char * out = (char*)malloc(33);
+  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
+    return "";
+  String res = String(out);
+  free(out);
+  return res;
+}
+
+String generateDigestHash(const char * username, const char * password, const char * realm){
+  if(username == NULL || password == NULL || realm == NULL){
+    return "";
+  }
+  char * out = (char*)malloc(33);
+  String res = String(username);
+  res.concat(":");
+  res.concat(realm);
+  res.concat(":");
+  String in = res;
+  in.concat(password);
+  if(out == NULL || !getMD5((uint8_t*)(in.c_str()), in.length(), out))
+    return "";
+  res.concat(out);
+  free(out);
+  return res;
+}
+
+String requestDigestAuthentication(const char * realm){
+  String header = "realm=\"";
+  if(realm == NULL)
+    header.concat("asyncesp");
+  else
+    header.concat(realm);
+  header.concat( "\", qop=\"auth\", nonce=\"");
+  header.concat(genRandomMD5());
+  header.concat("\", opaque=\"");
+  header.concat(genRandomMD5());
+  header.concat("\"");
+  return header;
+}
+
+bool checkDigestAuthentication(const char * header, const char * method, const char * username, const char * password, const char * realm, bool passwordIsHash, const char * nonce, const char * opaque, const char * uri){
+  if(username == NULL || password == NULL || header == NULL || method == NULL){
+    //os_printf("AUTH FAIL: missing requred fields\n");
+    return false;
+  }
+
+  String myHeader = String(header);
+  int nextBreak = myHeader.indexOf(", ");
+  if(nextBreak < 0){
+    //os_printf("AUTH FAIL: no variables\n");
+    return false;
+  }
+
+  String myUsername = String();
+  String myRealm = String();
+  String myNonce = String();
+  String myUri = String();
+  String myResponse = String();
+  String myQop = String();
+  String myNc = String();
+  String myCnonce = String();
+
+  myHeader += ", ";
+  do {
+    String avLine = myHeader.substring(0, nextBreak);
+    myHeader = myHeader.substring(nextBreak+2);
+    nextBreak = myHeader.indexOf(", ");
+
+    int eqSign = avLine.indexOf("=");
+    if(eqSign < 0){
+      //os_printf("AUTH FAIL: no = sign\n");
+      return false;
+    }
+    String varName = avLine.substring(0, eqSign);
+    avLine = avLine.substring(eqSign + 1);
+    if(avLine.startsWith("\"")){
+      avLine = avLine.substring(1, avLine.length() - 1);
+    }
+
+    if(varName.equals("username")){
+      if(!avLine.equals(username)){
+        //os_printf("AUTH FAIL: username\n");
+        return false;
+      }
+      myUsername = avLine;
+    } else if(varName.equals("realm")){
+      if(realm != NULL && !avLine.equals(realm)){
+        //os_printf("AUTH FAIL: realm\n");
+        return false;
+      }
+      myRealm = avLine;
+    } else if(varName.equals("nonce")){
+      if(nonce != NULL && !avLine.equals(nonce)){
+        //os_printf("AUTH FAIL: nonce\n");
+        return false;
+      }
+      myNonce = avLine;
+    } else if(varName.equals("opaque")){
+      if(opaque != NULL && !avLine.equals(opaque)){
+        //os_printf("AUTH FAIL: opaque\n");
+        return false;
+      }
+    } else if(varName.equals("uri")){
+      if(uri != NULL && !avLine.equals(uri)){
+        //os_printf("AUTH FAIL: uri\n");
+        return false;
+      }
+      myUri = avLine;
+    } else if(varName.equals("response")){
+      myResponse = avLine;
+    } else if(varName.equals("qop")){
+      myQop = avLine;
+    } else if(varName.equals("nc")){
+      myNc = avLine;
+    } else if(varName.equals("cnonce")){
+      myCnonce = avLine;
+    }
+  } while(nextBreak > 0);
+
+  String ha1 = (passwordIsHash) ? String(password) : myUsername + ":" + myRealm + ":" + String(password);
+  String ha2 = String(method) + ":" + myUri;
+  String response = stringMD5(ha1) + ":" + myNonce + ":" + myNc + ":" + myCnonce + ":" + myQop + ":" + stringMD5(ha2);
+
+  if(myResponse.equals(stringMD5(response))){
+    //os_printf("AUTH SUCCESS\n");
+    return true;
+  }
+
+  //os_printf("AUTH FAIL: password\n");
+  return false;
+}
diff --git a/libraries/ESPAsyncWebServer-master/src/WebAuthentication.h b/libraries/ESPAsyncWebServer-master/src/WebAuthentication.h
new file mode 100644
index 0000000..ff68265
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebAuthentication.h
@@ -0,0 +1,34 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef WEB_AUTHENTICATION_H_
+#define WEB_AUTHENTICATION_H_
+
+#include "Arduino.h"
+
+bool checkBasicAuthentication(const char * header, const char * username, const char * password);
+String requestDigestAuthentication(const char * realm);
+bool checkDigestAuthentication(const char * header, const char * method, const char * username, const char * password, const char * realm, bool passwordIsHash, const char * nonce, const char * opaque, const char * uri);
+
+//for storing hashed versions on the device that can be authenticated against
+String generateDigestHash(const char * username, const char * password, const char * realm);
+
+#endif
diff --git a/libraries/ESPAsyncWebServer-master/src/WebHandlerImpl.h b/libraries/ESPAsyncWebServer-master/src/WebHandlerImpl.h
new file mode 100644
index 0000000..3b52560
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebHandlerImpl.h
@@ -0,0 +1,103 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef ASYNCWEBSERVERHANDLERIMPL_H_
+#define ASYNCWEBSERVERHANDLERIMPL_H_
+
+
+#include "stddef.h"
+#include <time.h>
+
+class AsyncStaticWebHandler: public AsyncWebHandler {
+  private:
+    bool _getFile(AsyncWebServerRequest *request);
+    bool _fileExists(AsyncWebServerRequest *request, const String path);
+    uint8_t _countBits(const uint8_t value);
+  protected:
+    FS _fs;
+    String _uri;
+    String _path;
+    String _default_file;
+    String _cache_control;
+    String _last_modified;
+    bool _isDir;
+    bool _gzipFirst;
+    uint8_t _gzipStats;
+  public:
+    AsyncStaticWebHandler(const char* uri, FS& fs, const char* path, const char* cache_control);
+    bool canHandle(AsyncWebServerRequest *request);
+    void handleRequest(AsyncWebServerRequest *request);
+    AsyncStaticWebHandler& setIsDir(bool isDir);
+    AsyncStaticWebHandler& setDefaultFile(const char* filename);
+    AsyncStaticWebHandler& setCacheControl(const char* cache_control);
+    AsyncStaticWebHandler& setLastModified(const char* last_modified);
+    AsyncStaticWebHandler& setLastModified(struct tm* last_modified);
+  #ifdef ESP8266
+    AsyncStaticWebHandler& setLastModified(time_t last_modified);
+    AsyncStaticWebHandler& setLastModified(); //sets to current time. Make sure sntp is runing and time is updated
+  #endif
+};
+
+class AsyncCallbackWebHandler: public AsyncWebHandler {
+  private:
+  protected:
+    String _uri;
+    WebRequestMethod _method;
+    ArRequestHandlerFunction _onRequest;
+    ArUploadHandlerFunction _onUpload;
+    ArBodyHandlerFunction _onBody;
+  public:
+    AsyncCallbackWebHandler() : _uri(), _method(HTTP_ANY), _onRequest(NULL), _onUpload(NULL), _onBody(NULL){}
+    void setUri(String uri){ _uri = uri; }
+    void setMethod(WebRequestMethod method){ _method = method; }
+    void onRequest(ArRequestHandlerFunction fn){ _onRequest = fn; }
+    void onUpload(ArUploadHandlerFunction fn){ _onUpload = fn; }
+    void onBody(ArBodyHandlerFunction fn){ _onBody = fn; }
+
+    bool canHandle(AsyncWebServerRequest *request){
+      if(!_onRequest)
+        return false;
+
+      if(_method != HTTP_ANY && request->method() != _method)
+        return false;
+
+      if(_uri.length() && (_uri != request->url() && !request->url().startsWith(_uri+"/")))
+        return false;
+
+      request->addInterestingHeader("ANY");
+      return true;
+    }
+    void handleRequest(AsyncWebServerRequest *request){
+      if(_onRequest)
+        _onRequest(request);
+      else
+        request->send(500);
+    }
+    void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final){
+      if(_onUpload)
+        _onUpload(request, filename, index, data, len, final);
+    }
+    void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
+      if(_onBody)
+        _onBody(request, data, len, index, total);
+    }
+};
+
+#endif /* ASYNCWEBSERVERHANDLERIMPL_H_ */
diff --git a/libraries/ESPAsyncWebServer-master/src/WebHandlers.cpp b/libraries/ESPAsyncWebServer-master/src/WebHandlers.cpp
new file mode 100644
index 0000000..d125992
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebHandlers.cpp
@@ -0,0 +1,196 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "ESPAsyncWebServer.h"
+#include "WebHandlerImpl.h"
+
+AsyncStaticWebHandler::AsyncStaticWebHandler(const char* uri, FS& fs, const char* path, const char* cache_control)
+  : _fs(fs), _uri(uri), _path(path), _default_file("index.htm"), _cache_control(cache_control), _last_modified("")
+{
+  // Ensure leading '/'
+  if (_uri.length() == 0 || _uri[0] != '/') _uri = "/" + _uri;
+  if (_path.length() == 0 || _path[0] != '/') _path = "/" + _path;
+
+  // If path ends with '/' we assume a hint that this is a directory to improve performance.
+  // However - if it does not end with '/' we, can't assume a file, path can still be a directory.
+  _isDir = _path[_path.length()-1] == '/';
+
+  // Remove the trailing '/' so we can handle default file
+  // Notice that root will be "" not "/"
+  if (_uri[_uri.length()-1] == '/') _uri = _uri.substring(0, _uri.length()-1);
+  if (_path[_path.length()-1] == '/') _path = _path.substring(0, _path.length()-1);
+
+  // Reset stats
+  _gzipFirst = false;
+  _gzipStats = 0xF8;
+}
+
+AsyncStaticWebHandler& AsyncStaticWebHandler::setIsDir(bool isDir){
+  _isDir = isDir;
+  return *this;
+}
+
+AsyncStaticWebHandler& AsyncStaticWebHandler::setDefaultFile(const char* filename){
+  _default_file = String(filename);
+  return *this;
+}
+
+AsyncStaticWebHandler& AsyncStaticWebHandler::setCacheControl(const char* cache_control){
+  _cache_control = String(cache_control);
+  return *this;
+}
+
+AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(const char* last_modified){
+  _last_modified = String(last_modified);
+  return *this;
+}
+
+AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(struct tm* last_modified){
+  char result[30];
+  strftime (result,30,"%a, %d %b %Y %H:%M:%S %Z", last_modified);
+  return setLastModified((const char *)result);
+}
+#ifdef ESP8266
+AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(time_t last_modified){
+  return setLastModified((struct tm *)gmtime(&last_modified));
+}
+
+AsyncStaticWebHandler& AsyncStaticWebHandler::setLastModified(){
+  time_t last_modified;
+  if(time(&last_modified) == 0) //time is not yet set
+    return *this;
+  return setLastModified(last_modified);
+}
+#endif
+bool AsyncStaticWebHandler::canHandle(AsyncWebServerRequest *request)
+{
+  if (request->method() == HTTP_GET &&
+      request->url().startsWith(_uri) &&
+      _getFile(request)) {
+
+    // We interested in "If-Modified-Since" header to check if file was modified
+    if (_last_modified.length())
+      request->addInterestingHeader("If-Modified-Since");
+
+    DEBUGF("[AsyncStaticWebHandler::canHandle] TRUE\n");
+    return true;
+  }
+
+  return false;
+}
+
+bool AsyncStaticWebHandler::_getFile(AsyncWebServerRequest *request)
+{
+  // Remove the found uri
+  String path = request->url().substring(_uri.length());
+
+  // We can skip the file check and look for default if request is to the root of a directory or that request path ends with '/'
+  bool canSkipFileCheck = (_isDir && path.length() == 0) || (path.length() && path[path.length()-1] == '/');
+
+  path = _path + path;
+
+  // Do we have a file or .gz file
+  if (!canSkipFileCheck && _fileExists(request, path))
+    return true;
+
+  // Can't handle if not default file
+  if (_default_file.length() == 0)
+    return false;
+
+  // Try to add default file, ensure there is a trailing '/' ot the path.
+  if (path.length() == 0 || path[path.length()-1] != '/')
+    path += "/";
+  path += _default_file;
+
+  return _fileExists(request, path);
+}
+
+bool AsyncStaticWebHandler::_fileExists(AsyncWebServerRequest *request, const String path)
+{
+  bool fileFound = false;
+  bool gzipFound = false;
+
+  String gzip = path + ".gz";
+
+  if (_gzipFirst) {
+    request->_tempFile = _fs.open(gzip, "r");
+    gzipFound = request->_tempFile == true;
+    if (!gzipFound){
+      request->_tempFile = _fs.open(path, "r");
+      fileFound = request->_tempFile == true;
+    }
+  } else {
+    request->_tempFile = _fs.open(path, "r");
+    fileFound = request->_tempFile == true;
+    if (!fileFound){
+      request->_tempFile = _fs.open(gzip, "r");
+      gzipFound = request->_tempFile == true;
+    }
+  }
+
+  bool found = fileFound || gzipFound;
+
+  if (found) {
+    // Extract the file name from the path and keep it in _tempObject
+    size_t pathLen = path.length();
+    char * _tempPath = (char*)malloc(pathLen+1);
+    snprintf(_tempPath, pathLen+1, "%s", path.c_str());
+    request->_tempObject = (void*)_tempPath;
+
+    // Calculate gzip statistic
+    _gzipStats = (_gzipStats << 1) + (gzipFound ? 1 : 0);
+    if (_gzipStats == 0x00) _gzipFirst = false; // All files are not gzip
+    else if (_gzipStats == 0xFF) _gzipFirst = true; // All files are gzip
+    else _gzipFirst = _countBits(_gzipStats) > 4; // IF we have more gzip files - try gzip first
+  }
+
+  return found;
+}
+
+uint8_t AsyncStaticWebHandler::_countBits(const uint8_t value)
+{
+  uint8_t w = value;
+  uint8_t n;
+  for (n=0; w!=0; n++) w&=w-1;
+  return n;
+}
+
+void AsyncStaticWebHandler::handleRequest(AsyncWebServerRequest *request)
+{
+  // Get the filename from request->_tempObject and free it
+  String filename = String((char*)request->_tempObject);
+  free(request->_tempObject);
+  request->_tempObject = NULL;
+
+  if (request->_tempFile == true) {
+    if (_last_modified.length() && _last_modified == request->header("If-Modified-Since")) {
+      request->send(304); // Not modified
+    } else {
+      AsyncWebServerResponse * response = new AsyncFileResponse(request->_tempFile, filename);
+      if (_last_modified.length())
+        response->addHeader("Last-Modified", _last_modified);
+      if (_cache_control.length())
+        response->addHeader("Cache-Control", _cache_control);
+      request->send(response);
+    }
+  } else {
+    request->send(404);
+  }
+}
diff --git a/libraries/ESPAsyncWebServer-master/src/WebRequest.cpp b/libraries/ESPAsyncWebServer-master/src/WebRequest.cpp
new file mode 100644
index 0000000..fd38087
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebRequest.cpp
@@ -0,0 +1,865 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "ESPAsyncWebServer.h"
+#include "WebResponseImpl.h"
+#include "WebAuthentication.h"
+
+#ifndef ESP8266
+#define os_strlen strlen
+#endif
+
+#define __is_param_char(c) ((c) && ((c) != '{') && ((c) != '[') && ((c) != '&') && ((c) != '='))
+
+enum { PARSE_REQ_START, PARSE_REQ_HEADERS, PARSE_REQ_BODY, PARSE_REQ_END, PARSE_REQ_FAIL };
+
+AsyncWebServerRequest::AsyncWebServerRequest(AsyncWebServer* s, AsyncClient* c)
+  : _client(c)
+  , _server(s)
+  , _handler(NULL)
+  , _response(NULL)
+  , _interestingHeaders(new StringArray())
+  , _temp()
+  , _parseState(0)
+  , _version(0)
+  , _method(HTTP_ANY)
+  , _url()
+  , _host()
+  , _contentType()
+  , _boundary()
+  , _authorization()
+  , _isDigest(false)
+  , _isMultipart(false)
+  , _isPlainPost(false)
+  , _expectingContinue(false)
+  , _contentLength(0)
+  , _parsedLength(0)
+  , _headers(NULL)
+  , _params(NULL)
+  , _multiParseState(0)
+  , _boundaryPosition(0)
+  , _itemStartIndex(0)
+  , _itemSize(0)
+  , _itemName()
+  , _itemFilename()
+  , _itemType()
+  , _itemValue()
+  , _itemBuffer(0)
+  , _itemBufferIndex(0)
+  , _itemIsFile(false)
+  , _tempObject(NULL)
+  , next(NULL)
+{
+  c->onError([](void *r, AsyncClient* c, int8_t error){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onError(error); }, this);
+  c->onAck([](void *r, AsyncClient* c, size_t len, uint32_t time){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onAck(len, time); }, this);
+  c->onDisconnect([](void *r, AsyncClient* c){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onDisconnect(); delete c; }, this);
+  c->onTimeout([](void *r, AsyncClient* c, uint32_t time){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onTimeout(time); }, this);
+  c->onData([](void *r, AsyncClient* c, void *buf, size_t len){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onData(buf, len); }, this);
+  c->onPoll([](void *r, AsyncClient* c){ AsyncWebServerRequest *req = (AsyncWebServerRequest*)r; req->_onPoll(); }, this);
+}
+
+AsyncWebServerRequest::~AsyncWebServerRequest(){
+  while(_headers != NULL){
+    AsyncWebHeader *h = _headers;
+    _headers = h->next;
+    delete h;
+  }
+
+  while(_params != NULL){
+    AsyncWebParameter *p = _params;
+    _params = p->next;
+    delete p;
+  }
+
+  _interestingHeaders->free();
+  delete _interestingHeaders;
+
+  if(_response != NULL){
+    delete _response;
+  }
+
+  if(_tempObject != NULL){
+    free(_tempObject);
+  }
+
+}
+
+void AsyncWebServerRequest::_onData(void *buf, size_t len){
+  if(_parseState < PARSE_REQ_BODY){
+    // Find new line in buf
+    char *str = (char*)buf;
+    size_t i = 0;
+    for (; i < len; i++) if (str[i] == '\n') break;
+    if (i == len) { // No new line, just add the buffer in _temp
+      char ch = str[len-1];
+      str[len-1] = 0;
+      _temp.reserve(_temp.length()+len);
+      _temp.concat(str);
+      _temp.concat(ch);
+    } else { // Found new line - extract it and parse
+      str[i] = 0; // Terminate the string at the end of the line.
+      _temp.concat(str);
+      _temp.trim();
+      _parseLine();
+      if (++i < len) _onData(str+i, len-i); // Still have more buffer to process
+    }
+  } else if(_parseState == PARSE_REQ_BODY){
+    if(_isMultipart){
+      size_t i;
+      for(i=0; i<len; i++){
+        _parseMultipartPostByte(((uint8_t*)buf)[i], i == len - 1);
+        _parsedLength++;
+      }
+    } else {
+      if(_parsedLength == 0){
+        if(_contentType.startsWith("application/x-www-form-urlencoded")){
+          _isPlainPost = true;
+        } else if(_contentType == "text/plain" && __is_param_char(((char*)buf)[0])){
+          size_t i = 0;
+          while (i<len && __is_param_char(((char*)buf)[i++]));
+          if(i < len && ((char*)buf)[i-1] == '='){
+            _isPlainPost = true;
+          }
+        }
+      }
+      if(!_isPlainPost) {
+        //check if authenticated before calling the body
+        if(_handler) _handler->handleBody(this, (uint8_t*)buf, len, _parsedLength, _contentLength);
+        _parsedLength += len;
+      } else {
+        size_t i;
+        for(i=0; i<len; i++){
+          _parsedLength++;
+          _parsePlainPostChar(((uint8_t*)buf)[i]);
+        }
+      }
+    }
+
+    if(_parsedLength == _contentLength){
+      _parseState = PARSE_REQ_END;
+      //check if authenticated before calling handleRequest and request auth instead
+      if(_handler) _handler->handleRequest(this);
+      else send(501);
+    }
+  }
+}
+
+void AsyncWebServerRequest::_onPoll(){
+  //os_printf("p\n");
+  if(_response != NULL && _client != NULL && _client->canSend() && !_response->_finished()){
+    _response->_ack(this, 0, 0);
+  }
+}
+
+void AsyncWebServerRequest::_onAck(size_t len, uint32_t time){
+  //os_printf("a:%u:%u\n", len, time);
+  if(_response != NULL){
+    if(!_response->_finished()){
+      _response->_ack(this, len, time);
+    } else {
+      AsyncWebServerResponse* r = _response;
+      _response = NULL;
+      delete r;
+    }
+  }
+}
+
+void AsyncWebServerRequest::_onError(int8_t error){
+
+}
+
+void AsyncWebServerRequest::_onTimeout(uint32_t time){
+  os_printf("TIMEOUT: %u, state: %s\n", time, _client->stateToString());
+  _client->close();
+}
+
+void AsyncWebServerRequest::_onDisconnect(){
+  //os_printf("d\n");
+  _server->_handleDisconnect(this);
+}
+
+void AsyncWebServerRequest::_addParam(AsyncWebParameter *p){
+  if(p == NULL)
+    return;
+  if(_params == NULL)
+    _params = p;
+  else {
+    AsyncWebParameter *ps = _params;
+    while(ps->next != NULL) ps = ps->next;
+    ps->next = p;
+  }
+}
+
+void AsyncWebServerRequest::_addGetParams(String params){
+  int start = 0;
+  while (start < params.length()){
+    int end = params.indexOf('&', start);
+    if (end < 0) end = params.length();
+    int equal = params.indexOf('=', start);
+    if (equal < 0 || equal > end) equal = end;
+    String name = params.substring(start, equal);
+    String value = equal + 1 < end ? params.substring(equal + 1, end) : String();
+    _addParam(new AsyncWebParameter(name, value));
+    start = end + 1;
+  }
+}
+
+bool AsyncWebServerRequest::_parseReqHead(){
+  // Split the head into method, url and version
+  int index = _temp.indexOf(' ');
+  String m = _temp.substring(0, index);
+  index = _temp.indexOf(' ', index+1);
+  String u = _temp.substring(m.length()+1, index);
+  _temp = _temp.substring(index+1);
+
+  if(m == "GET"){
+    _method = HTTP_GET;
+  } else if(m == "POST"){
+    _method = HTTP_POST;
+  } else if(m == "DELETE"){
+    _method = HTTP_DELETE;
+  } else if(m == "PUT"){
+    _method = HTTP_PUT;
+  } else if(m == "PATCH"){
+    _method = HTTP_PATCH;
+  } else if(m == "HEAD"){
+    _method = HTTP_HEAD;
+  } else if(m == "OPTIONS"){
+    _method = HTTP_OPTIONS;
+  }
+
+  u = urlDecode(u);
+  String g = String();
+  index = u.indexOf('?');
+  if(index > 0){
+    g = u.substring(index +1);
+    u = u.substring(0, index);
+  }
+  _url = u;
+  _addGetParams(g);
+
+  if(!_temp.startsWith("HTTP/1.0"))
+    _version = 1;
+
+  _temp = String();
+  return true;
+}
+
+bool AsyncWebServerRequest::_parseReqHeader(){
+  int index = _temp.indexOf(':');
+  if(index){
+    String name = _temp.substring(0, index);
+    String value = _temp.substring(index + 2);
+    if(name == "Host"){
+      _host = value;
+      _server->_rewriteRequest(this);
+      _server->_attachHandler(this);
+    } else if(name == "Content-Type"){
+      if (value.startsWith("multipart/")){
+        _boundary = value.substring(value.indexOf('=')+1);
+        _contentType = value.substring(0, value.indexOf(';'));
+        _isMultipart = true;
+      } else {
+        _contentType = value;
+      }
+    } else if(name == "Content-Length"){
+      _contentLength = atoi(value.c_str());
+    } else if(name == "Expect" && value == "100-continue"){
+      _expectingContinue = true;
+    } else if(name == "Authorization"){
+      if(value.startsWith("Basic")){
+        _authorization = value.substring(6);
+      } else if(value.startsWith("Digest")){
+        _isDigest = true;
+        _authorization = value.substring(7);
+      }
+    } else {
+      if(_interestingHeaders->contains(name) || _interestingHeaders->contains("ANY")){
+        AsyncWebHeader *h = new AsyncWebHeader(name, value);
+        if(_headers == NULL)
+          _headers = h;
+        else {
+          AsyncWebHeader *hs = _headers;
+          while(hs->next != NULL) hs = hs->next;
+          hs->next = h;
+        }
+      }
+    }
+  }
+  _temp = String();
+  return true;
+}
+
+void AsyncWebServerRequest::_parsePlainPostChar(uint8_t data){
+  if(data && (char)data != '&')
+    _temp += (char)data;
+  if(!data || (char)data == '&' || _parsedLength == _contentLength){
+    _temp = urlDecode(_temp);
+    String name = "body";
+    String value = _temp;
+    if(!_temp.startsWith("{") && !_temp.startsWith("[") && _temp.indexOf('=') > 0){
+      name = _temp.substring(0, _temp.indexOf('='));
+      value = _temp.substring(_temp.indexOf('=') + 1);
+    }
+    _addParam(new AsyncWebParameter(name, value, true));
+    _temp = String();
+  }
+}
+
+void AsyncWebServerRequest::_handleUploadByte(uint8_t data, bool last){
+  _itemBuffer[_itemBufferIndex++] = data;
+
+  if(last || _itemBufferIndex == 1460){
+    //check if authenticated before calling the upload
+    if(_handler)
+      _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, false);
+    _itemBufferIndex = 0;
+  }
+}
+
+enum {
+  EXPECT_BOUNDARY,
+  PARSE_HEADERS,
+  WAIT_FOR_RETURN1,
+  EXPECT_FEED1,
+  EXPECT_DASH1,
+  EXPECT_DASH2,
+  BOUNDARY_OR_DATA,
+  DASH3_OR_RETURN2,
+  EXPECT_FEED2,
+  PARSING_FINISHED,
+  PARSE_ERROR
+};
+
+void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
+#define itemWriteByte(b) do { _itemSize++; if(_itemIsFile) _handleUploadByte(b, last); else _itemValue+=(char)(b); } while(0)
+
+  if(!_parsedLength){
+    _multiParseState = EXPECT_BOUNDARY;
+    _temp = String();
+    _itemName = String();
+    _itemFilename = String();
+    _itemType = String();
+  }
+
+  if(_multiParseState == WAIT_FOR_RETURN1){
+    if(data != '\r'){
+      itemWriteByte(data);
+    } else {
+      _multiParseState = EXPECT_FEED1;
+    }
+  } else if(_multiParseState == EXPECT_BOUNDARY){
+    if(_parsedLength < 2 && data != '-'){
+      _multiParseState = PARSE_ERROR;
+      return;
+    } else if(_parsedLength - 2 < _boundary.length() && _boundary.c_str()[_parsedLength - 2] != data){
+      _multiParseState = PARSE_ERROR;
+      return;
+    } else if(_parsedLength - 2 == _boundary.length() && data != '\r'){
+      _multiParseState = PARSE_ERROR;
+      return;
+    } else if(_parsedLength - 3 == _boundary.length()){
+      if(data != '\n'){
+        _multiParseState = PARSE_ERROR;
+        return;
+      }
+      _multiParseState = PARSE_HEADERS;
+      _itemIsFile = false;
+    }
+  } else if(_multiParseState == PARSE_HEADERS){
+    if((char)data != '\r' && (char)data != '\n')
+       _temp += (char)data;
+    if((char)data == '\n'){
+      if(_temp.length()){
+        if(_temp.startsWith("Content-Type:")){
+          _itemType = _temp.substring(14);
+          _itemIsFile = true;
+        } else if(_temp.startsWith("Content-Disposition:")){
+          _temp = _temp.substring(_temp.indexOf(';') + 2);
+          while(_temp.indexOf(';') > 0){
+            String name = _temp.substring(0, _temp.indexOf('='));
+            String nameVal = _temp.substring(_temp.indexOf('=') + 2, _temp.indexOf(';') - 1);
+            if(name == "name"){
+              _itemName = nameVal;
+            } else if(name == "filename"){
+              _itemFilename = nameVal;
+              _itemIsFile = true;
+            }
+            _temp = _temp.substring(_temp.indexOf(';') + 2);
+          }
+          String name = _temp.substring(0, _temp.indexOf('='));
+          String nameVal = _temp.substring(_temp.indexOf('=') + 2, _temp.length() - 1);
+          if(name == "name"){
+            _itemName = nameVal;
+          } else if(name == "filename"){
+            _itemFilename = nameVal;
+            _itemIsFile = true;
+          }
+        }
+        _temp = String();
+      } else {
+        _multiParseState = WAIT_FOR_RETURN1;
+        //value starts from here
+        _itemSize = 0;
+        _itemStartIndex = _parsedLength;
+        _itemValue = String();
+        if(_itemIsFile){
+          if(_itemBuffer)
+            free(_itemBuffer);
+          _itemBuffer = (uint8_t*)malloc(1460);
+          if(_itemBuffer == NULL){
+            _multiParseState = PARSE_ERROR;
+            return;
+          }
+          _itemBufferIndex = 0;
+        }
+      }
+    }
+  } else if(_multiParseState == EXPECT_FEED1){
+    if(data != '\n'){
+      _multiParseState = WAIT_FOR_RETURN1;
+      itemWriteByte('\r'); _parseMultipartPostByte(data, last);
+    } else {
+      _multiParseState = EXPECT_DASH1;
+    }
+  } else if(_multiParseState == EXPECT_DASH1){
+    if(data != '-'){
+      _multiParseState = WAIT_FOR_RETURN1;
+      itemWriteByte('\r'); itemWriteByte('\n');  _parseMultipartPostByte(data, last);
+    } else {
+      _multiParseState = EXPECT_DASH2;
+    }
+  } else if(_multiParseState == EXPECT_DASH2){
+    if(data != '-'){
+      _multiParseState = WAIT_FOR_RETURN1;
+      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  _parseMultipartPostByte(data, last);
+    } else {
+      _multiParseState = BOUNDARY_OR_DATA;
+      _boundaryPosition = 0;
+    }
+  } else if(_multiParseState == BOUNDARY_OR_DATA){
+    if(_boundaryPosition < _boundary.length() && _boundary.c_str()[_boundaryPosition] != data){
+      _multiParseState = WAIT_FOR_RETURN1;
+      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
+      uint8_t i;
+      for(i=0; i<_boundaryPosition; i++)
+        itemWriteByte(_boundary.c_str()[i]);
+      _parseMultipartPostByte(data, last);
+    } else if(_boundaryPosition == _boundary.length() - 1){
+      _multiParseState = DASH3_OR_RETURN2;
+      if(!_itemIsFile){
+        _addParam(new AsyncWebParameter(_itemName, _itemValue, true));
+      } else {
+        if(_itemSize){
+          //check if authenticated before calling the upload
+          if(_handler) _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, true);
+          _itemBufferIndex = 0;
+          _addParam(new AsyncWebParameter(_itemName, _itemFilename, true, true, _itemSize));
+        }
+        free(_itemBuffer);
+      }
+
+    } else {
+      _boundaryPosition++;
+    }
+  } else if(_multiParseState == DASH3_OR_RETURN2){
+    if(data == '-' && (_contentLength - _parsedLength - 4) != 0){
+      os_printf("ERROR: The parser got to the end of the POST but is expecting %u bytes more!\nDrop an issue so we can have more info on the matter!\n", _contentLength - _parsedLength - 4);
+      _contentLength = _parsedLength + 4;//lets close the request gracefully
+    }
+    if(data == '\r'){
+      _multiParseState = EXPECT_FEED2;
+    } else if(data == '-' && _contentLength == (_parsedLength + 4)){
+      _multiParseState = PARSING_FINISHED;
+    } else {
+      _multiParseState = WAIT_FOR_RETURN1;
+      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
+      uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
+      _parseMultipartPostByte(data, last);
+    }
+  } else if(_multiParseState == EXPECT_FEED2){
+    if(data == '\n'){
+      _multiParseState = PARSE_HEADERS;
+      _itemIsFile = false;
+    } else {
+      _multiParseState = WAIT_FOR_RETURN1;
+      itemWriteByte('\r'); itemWriteByte('\n'); itemWriteByte('-');  itemWriteByte('-');
+      uint8_t i; for(i=0; i<_boundary.length(); i++) itemWriteByte(_boundary.c_str()[i]);
+      itemWriteByte('\r'); _parseMultipartPostByte(data, last);
+    }
+  }
+}
+
+void AsyncWebServerRequest::_parseLine(){
+  if(_parseState == PARSE_REQ_START){
+    if(!_temp.length()){
+      _parseState = PARSE_REQ_FAIL;
+      _client->close();
+    } else {
+      _parseReqHead();
+      _parseState = PARSE_REQ_HEADERS;
+    }
+    return;
+  }
+
+  if(_parseState == PARSE_REQ_HEADERS){
+    if(!_temp.length()){
+      //end of headers
+      if(_expectingContinue){
+        const char * response = "HTTP/1.1 100 Continue\r\n\r\n";
+        _client->write(response, os_strlen(response));
+      }
+      //check handler for authentication
+      if(_contentLength){
+        _parseState = PARSE_REQ_BODY;
+      } else {
+        _parseState = PARSE_REQ_END;
+        if(_handler) _handler->handleRequest(this);
+        else send(501);
+      }
+    } else _parseReqHeader();
+  }
+}
+
+
+int AsyncWebServerRequest::headers(){
+  int i = 0;
+  AsyncWebHeader* h = _headers;
+  while(h != NULL){
+    i++; h = h->next;
+  }
+  return i;
+}
+
+bool AsyncWebServerRequest::hasHeader(String name){
+  AsyncWebHeader* h = _headers;
+  while(h != NULL){
+    if(h->name() == name)
+      return true;
+    h = h->next;
+  }
+  return false;
+}
+
+AsyncWebHeader* AsyncWebServerRequest::getHeader(String name){
+  AsyncWebHeader* h = _headers;
+  while(h != NULL){
+    if(h->name() == name)
+      return h;
+    h = h->next;
+  }
+  return NULL;
+}
+
+AsyncWebHeader* AsyncWebServerRequest::getHeader(int num){
+  int i = 0;
+  AsyncWebHeader* h = _headers;
+  while(h != NULL){
+    if(num == i++)
+      return h;
+    h = h->next;
+  }
+  return NULL;
+}
+
+int AsyncWebServerRequest::params(){
+  int i = 0;
+  AsyncWebParameter* h = _params;
+  while(h != NULL){
+    i++; h = h->next;
+  }
+  return i;
+}
+
+bool AsyncWebServerRequest::hasParam(String name, bool post, bool file){
+  AsyncWebParameter* h = _params;
+  while(h != NULL){
+    if(h->name() == name && h->isPost() == post && h->isFile() == file)
+      return true;
+    h = h->next;
+  }
+  return false;
+}
+
+AsyncWebParameter* AsyncWebServerRequest::getParam(String name, bool post, bool file){
+  AsyncWebParameter* h = _params;
+  while(h != NULL){
+    if(h->name() == name && h->isPost() == post && h->isFile() == file)
+      return h;
+    h = h->next;
+  }
+  return NULL;
+}
+
+AsyncWebParameter* AsyncWebServerRequest::getParam(int num){
+  int i = 0;
+  AsyncWebParameter* h = _params;
+  while(h != NULL){
+    if(num == i++)
+      return h;
+    h = h->next;
+  }
+  return NULL;
+}
+
+void AsyncWebServerRequest::addInterestingHeader(String name){
+  if(!_interestingHeaders->contains(name)) _interestingHeaders->add(name);
+}
+
+void AsyncWebServerRequest::send(AsyncWebServerResponse *response){
+  _response = response;
+  if(_response == NULL){
+    _client->close(true);
+    _onDisconnect();
+    return;
+  }
+  if(!_response->_sourceValid()){
+    delete response;
+    _response = NULL;
+    send(500);
+  }
+  else
+    _response->_respond(this);
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(int code, String contentType, String content){
+  return new AsyncBasicResponse(code, contentType, content);
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(FS &fs, String path, String contentType, bool download){
+  if(fs.exists(path) || (!download && fs.exists(path+".gz")))
+    return new AsyncFileResponse(fs, path, contentType, download);
+  return NULL;
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(File content, String path, String contentType, bool download){
+  if(content == true)
+    return new AsyncFileResponse(content, path, contentType, download);
+  return NULL;
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(Stream &stream, String contentType, size_t len){
+  return new AsyncStreamResponse(stream, contentType, len);
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginResponse(String contentType, size_t len, AwsResponseFiller callback){
+  return new AsyncCallbackResponse(contentType, len, callback);
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginChunkedResponse(String contentType, AwsResponseFiller callback){
+  if(_version)
+    return new AsyncChunkedResponse(contentType, callback);
+  return new AsyncCallbackResponse(contentType, 0, callback);
+}
+
+AsyncResponseStream * AsyncWebServerRequest::beginResponseStream(String contentType, size_t bufferSize){
+  return new AsyncResponseStream(contentType, bufferSize);
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginResponse_P(int code, String contentType, const uint8_t * content, size_t len){
+  return new AsyncProgmemResponse(code, contentType, content, len);
+}
+
+AsyncWebServerResponse * AsyncWebServerRequest::beginResponse_P(int code, String contentType, PGM_P content){
+  return beginResponse_P(code, contentType, (const uint8_t *)content, strlen_P(content));
+}
+
+void AsyncWebServerRequest::send(int code, String contentType, String content){
+  send(beginResponse(code, contentType, content));
+}
+
+void AsyncWebServerRequest::send(FS &fs, String path, String contentType, bool download){
+  if(fs.exists(path) || (!download && fs.exists(path+".gz"))){
+    send(beginResponse(fs, path, contentType, download));
+  } else send(404);
+}
+
+void AsyncWebServerRequest::send(File content, String path, String contentType, bool download){
+  if(content == true){
+    send(beginResponse(content, path, contentType, download));
+  } else send(404);
+}
+
+void AsyncWebServerRequest::send(Stream &stream, String contentType, size_t len){
+  send(beginResponse(stream, contentType, len));
+}
+
+void AsyncWebServerRequest::send(String contentType, size_t len, AwsResponseFiller callback){
+  send(beginResponse(contentType, len, callback));
+}
+
+void AsyncWebServerRequest::sendChunked(String contentType, AwsResponseFiller callback){
+  send(beginChunkedResponse(contentType, callback));
+}
+
+void AsyncWebServerRequest::send_P(int code, String contentType, const uint8_t * content, size_t len){
+  send(beginResponse_P(code, contentType, content, len));
+}
+
+void AsyncWebServerRequest::send_P(int code, String contentType, PGM_P content){
+  send(beginResponse_P(code, contentType, content));
+}
+
+void AsyncWebServerRequest::redirect(String url){
+  AsyncWebServerResponse * response = beginResponse(302);
+  response->addHeader("Location",url);
+  send(response);
+}
+
+bool AsyncWebServerRequest::authenticate(const char * username, const char * password, const char * realm, bool passwordIsHash){
+  if(_authorization.length()){
+    if(_isDigest)
+      return checkDigestAuthentication(_authorization.c_str(), methodToString(), username, password, realm, passwordIsHash, NULL, NULL, NULL);
+    else if(!passwordIsHash)
+      return checkBasicAuthentication(_authorization.c_str(), username, password);
+    else
+      return _authorization.equals(password);
+  }
+  return false;
+}
+
+bool AsyncWebServerRequest::authenticate(const char * hash){
+  if(!_authorization.length() || hash == NULL)
+    return false;
+
+  if(_isDigest){
+    String hStr = String(hash);
+    int separator = hStr.indexOf(":");
+    if(separator <= 0)
+      return false;
+    String username = hStr.substring(0, separator);
+    hStr = hStr.substring(separator + 1);
+    separator = hStr.indexOf(":");
+    if(separator <= 0)
+      return false;
+    String realm = hStr.substring(0, separator);
+    hStr = hStr.substring(separator + 1);
+    return checkDigestAuthentication(_authorization.c_str(), methodToString(), username.c_str(), hStr.c_str(), realm.c_str(), true, NULL, NULL, NULL);
+  }
+
+  return (_authorization.equals(hash));
+}
+
+void AsyncWebServerRequest::requestAuthentication(const char * realm, bool isDigest){
+  AsyncWebServerResponse * r = beginResponse(401);
+  if(!isDigest && realm == NULL){
+    r->addHeader("WWW-Authenticate", "Basic realm=\"Login Required\"");
+  } else if(!isDigest){
+    String header = "Basic realm=\"";
+    header.concat(realm);
+    header.concat("\"");
+    r->addHeader("WWW-Authenticate", header);
+  } else {
+    String header = "Digest ";
+    header.concat(requestDigestAuthentication(realm));
+    r->addHeader("WWW-Authenticate", header);
+  }
+  send(r);
+}
+
+bool AsyncWebServerRequest::hasArg(const char* name){
+  AsyncWebParameter* h = _params;
+  while(h != NULL){
+    if(h->name() == String(name))
+      return true;
+    h = h->next;
+  }
+  return false;
+}
+
+String AsyncWebServerRequest::arg(const char* name){
+  AsyncWebParameter* h = _params;
+  while(h != NULL){
+    if(h->name() == String(name))
+      return h->value();
+    h = h->next;
+  }
+  return String();
+}
+
+String AsyncWebServerRequest::arg(int i){
+  return getParam(i)->value();
+}
+
+String AsyncWebServerRequest::argName(int i){
+  return getParam(i)->name();
+}
+
+String AsyncWebServerRequest::header(const char* name){
+  AsyncWebHeader* h = getHeader(String(name));
+  if(h)
+    return h->value();
+  return String();
+}
+
+String AsyncWebServerRequest::header(int i){
+  AsyncWebHeader* h = getHeader(i);
+  if(h)
+    return h->value();
+  return String();
+}
+
+String AsyncWebServerRequest::headerName(int i){
+  AsyncWebHeader* h = getHeader(i);
+  if(h)
+    return h->name();
+  return String();
+}
+
+bool AsyncWebServerRequest::hasHeader(const char* name){
+  return hasHeader(String(name));
+}
+
+
+String AsyncWebServerRequest::urlDecode(const String& text){
+  char temp[] = "0x00";
+  unsigned int len = text.length();
+  unsigned int i = 0;
+  String decoded = String();
+  decoded.reserve(len); // Allocate the string internal buffer - never longer from source text
+  while (i < len){
+    char decodedChar;
+    char encodedChar = text.charAt(i++);
+    if ((encodedChar == '%') && (i + 1 < len)){
+      temp[2] = text.charAt(i++);
+      temp[3] = text.charAt(i++);
+      decodedChar = strtol(temp, NULL, 16);
+    } else if (encodedChar == '+') {
+      decodedChar = ' ';
+    } else {
+      decodedChar = encodedChar;  // normal ascii char
+    }
+    decoded.concat(decodedChar);
+  }
+  return decoded;
+}
+
+
+const char * AsyncWebServerRequest::methodToString(){
+  if(_method == HTTP_ANY) return "ANY";
+  else if(_method == HTTP_GET) return "GET";
+  else if(_method == HTTP_POST) return "POST";
+  else if(_method == HTTP_DELETE) return "DELETE";
+  else if(_method == HTTP_PUT) return "PUT";
+  else if(_method == HTTP_PATCH) return "PATCH";
+  else if(_method == HTTP_HEAD) return "HEAD";
+  else if(_method == HTTP_OPTIONS) return "OPTIONS";
+  return "UNKNOWN";
+}
diff --git a/libraries/ESPAsyncWebServer-master/src/WebResponseImpl.h b/libraries/ESPAsyncWebServer-master/src/WebResponseImpl.h
new file mode 100644
index 0000000..6e3b1a4
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebResponseImpl.h
@@ -0,0 +1,108 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#ifndef ASYNCWEBSERVERRESPONSEIMPL_H_
+#define ASYNCWEBSERVERRESPONSEIMPL_H_
+
+class AsyncBasicResponse: public AsyncWebServerResponse {
+  private:
+    String _content;
+  public:
+    AsyncBasicResponse(int code, String contentType=String(), String content=String());
+    void _respond(AsyncWebServerRequest *request);
+    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+    bool _sourceValid(){ return true; }
+};
+
+class AsyncAbstractResponse: public AsyncWebServerResponse {
+  private:
+    String _head;
+  public:
+    void _respond(AsyncWebServerRequest *request);
+    size_t _ack(AsyncWebServerRequest *request, size_t len, uint32_t time);
+    bool _sourceValid(){ return false; }
+    virtual size_t _fillBuffer(uint8_t *buf, size_t maxLen){ return 0; }
+};
+
+class AsyncFileResponse: public AsyncAbstractResponse {
+  private:
+    File _content;
+    String _path;
+    void _setContentType(String path);
+  public:
+    AsyncFileResponse(FS &fs, String path, String contentType=String(), bool download=false);
+    AsyncFileResponse(File content, String path, String contentType=String(), bool download=false);
+    ~AsyncFileResponse();
+    bool _sourceValid(){ return !!(_content); }
+    size_t _fillBuffer(uint8_t *buf, size_t maxLen);
+};
+
+class AsyncStreamResponse: public AsyncAbstractResponse {
+  private:
+    Stream *_content;
+  public:
+    AsyncStreamResponse(Stream &stream, String contentType, size_t len);
+    bool _sourceValid(){ return !!(_content); }
+    size_t _fillBuffer(uint8_t *buf, size_t maxLen);
+};
+
+class AsyncCallbackResponse: public AsyncAbstractResponse {
+  private:
+    AwsResponseFiller _content;
+  public:
+    AsyncCallbackResponse(String contentType, size_t len, AwsResponseFiller callback);
+    bool _sourceValid(){ return !!(_content); }
+    size_t _fillBuffer(uint8_t *buf, size_t maxLen);
+};
+
+class AsyncChunkedResponse: public AsyncAbstractResponse {
+  private:
+    AwsResponseFiller _content;
+  public:
+    AsyncChunkedResponse(String contentType, AwsResponseFiller callback);
+    bool _sourceValid(){ return !!(_content); }
+    size_t _fillBuffer(uint8_t *buf, size_t maxLen);
+};
+
+class AsyncProgmemResponse: public AsyncAbstractResponse {
+  private:
+    const uint8_t * _content;
+  public:
+    AsyncProgmemResponse(int code, String contentType, const uint8_t * content, size_t len);
+    bool _sourceValid(){ return true; }
+    size_t _fillBuffer(uint8_t *buf, size_t maxLen);
+};
+
+class cbuf;
+
+class AsyncResponseStream: public AsyncAbstractResponse, public Print {
+  private:
+    cbuf *_content;
+  public:
+    AsyncResponseStream(String contentType, size_t bufferSize);
+    ~AsyncResponseStream();
+    bool _sourceValid(){ return (_state < RESPONSE_END); }
+    size_t _fillBuffer(uint8_t *buf, size_t maxLen);
+    size_t write(const uint8_t *data, size_t len);
+    size_t write(uint8_t data);
+    using Print::write;
+};
+
+#endif /* ASYNCWEBSERVERRESPONSEIMPL_H_ */
diff --git a/libraries/ESPAsyncWebServer-master/src/WebResponses.cpp b/libraries/ESPAsyncWebServer-master/src/WebResponses.cpp
new file mode 100644
index 0000000..1d9355e
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebResponses.cpp
@@ -0,0 +1,535 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "ESPAsyncWebServer.h"
+#include "WebResponseImpl.h"
+#include "cbuf.h"
+
+/*
+ * Abstract Response
+ * */
+const char* AsyncWebServerResponse::_responseCodeToString(int code) {
+  switch (code) {
+    case 100: return "Continue";
+    case 101: return "Switching Protocols";
+    case 200: return "OK";
+    case 201: return "Created";
+    case 202: return "Accepted";
+    case 203: return "Non-Authoritative Information";
+    case 204: return "No Content";
+    case 205: return "Reset Content";
+    case 206: return "Partial Content";
+    case 300: return "Multiple Choices";
+    case 301: return "Moved Permanently";
+    case 302: return "Found";
+    case 303: return "See Other";
+    case 304: return "Not Modified";
+    case 305: return "Use Proxy";
+    case 307: return "Temporary Redirect";
+    case 400: return "Bad Request";
+    case 401: return "Unauthorized";
+    case 402: return "Payment Required";
+    case 403: return "Forbidden";
+    case 404: return "Not Found";
+    case 405: return "Method Not Allowed";
+    case 406: return "Not Acceptable";
+    case 407: return "Proxy Authentication Required";
+    case 408: return "Request Time-out";
+    case 409: return "Conflict";
+    case 410: return "Gone";
+    case 411: return "Length Required";
+    case 412: return "Precondition Failed";
+    case 413: return "Request Entity Too Large";
+    case 414: return "Request-URI Too Large";
+    case 415: return "Unsupported Media Type";
+    case 416: return "Requested range not satisfiable";
+    case 417: return "Expectation Failed";
+    case 500: return "Internal Server Error";
+    case 501: return "Not Implemented";
+    case 502: return "Bad Gateway";
+    case 503: return "Service Unavailable";
+    case 504: return "Gateway Time-out";
+    case 505: return "HTTP Version not supported";
+    default:  return "";
+  }
+}
+
+AsyncWebServerResponse::AsyncWebServerResponse()
+  : _code(0)
+  , _headers(NULL)
+  , _contentType()
+  , _contentLength(0)
+  , _sendContentLength(true)
+  , _chunked(false)
+  , _headLength(0)
+  , _sentLength(0)
+  , _ackedLength(0)
+  , _state(RESPONSE_SETUP)
+{}
+
+AsyncWebServerResponse::~AsyncWebServerResponse(){
+  while(_headers != NULL){
+    AsyncWebHeader *h = _headers;
+    _headers = h->next;
+    delete h;
+  }
+}
+
+void AsyncWebServerResponse::setCode(int code){
+  if(_state == RESPONSE_SETUP)
+    _code = code;
+}
+
+void AsyncWebServerResponse::setContentLength(size_t len){
+  if(_state == RESPONSE_SETUP)
+    _contentLength = len;
+}
+
+void AsyncWebServerResponse::setContentType(String type){
+  if(_state == RESPONSE_SETUP)
+    _contentType = type;
+}
+
+void AsyncWebServerResponse::addHeader(String name, String value){
+  AsyncWebHeader *header = new AsyncWebHeader(name, value);
+  if(_headers == NULL){
+    _headers = header;
+  } else {
+    AsyncWebHeader *h = _headers;
+    while(h->next != NULL) h = h->next;
+    h->next = header;
+  }
+}
+
+String AsyncWebServerResponse::_assembleHead(uint8_t version){
+  if(version){
+    addHeader("Accept-Ranges","none");
+    if(_chunked)
+      addHeader("Transfer-Encoding","chunked");
+  }
+  String out = String();
+  int bufSize = 300;
+  char buf[bufSize];
+
+  snprintf(buf, bufSize, "HTTP/1.%d %d %s\r\n", version, _code, _responseCodeToString(_code));
+  out.concat(buf);
+
+  if(_sendContentLength) {
+    snprintf(buf, bufSize, "Content-Length: %d\r\n", _contentLength);
+    out.concat(buf);
+  }
+  if(_contentType.length()) {
+    snprintf(buf, bufSize, "Content-Type: %s\r\n", _contentType.c_str());
+    out.concat(buf);
+  }
+
+  AsyncWebHeader *h;
+  while(_headers != NULL){
+    h = _headers;
+    _headers = _headers->next;
+    snprintf(buf, bufSize, "%s: %s\r\n", h->name().c_str(), h->value().c_str());
+    out.concat(buf);
+    delete h;
+  }
+  out.concat("\r\n");
+  _headLength = out.length();
+  return out;
+}
+
+bool AsyncWebServerResponse::_started(){ return _state > RESPONSE_SETUP; }
+bool AsyncWebServerResponse::_finished(){ return _state > RESPONSE_WAIT_ACK; }
+bool AsyncWebServerResponse::_failed(){ return _state == RESPONSE_FAILED; }
+bool AsyncWebServerResponse::_sourceValid(){ return false; }
+void AsyncWebServerResponse::_respond(AsyncWebServerRequest *request){ _state = RESPONSE_END; request->client()->close(); }
+size_t AsyncWebServerResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){ return 0; }
+
+/*
+ * String/Code Response
+ * */
+AsyncBasicResponse::AsyncBasicResponse(int code, String contentType, String content){
+  _code = code;
+  _content = content;
+  _contentType = contentType;
+  if(_content.length()){
+    _contentLength = _content.length();
+    if(!_contentType.length())
+      _contentType = "text/plain";
+  }
+  addHeader("Connection","close");
+}
+
+void AsyncBasicResponse::_respond(AsyncWebServerRequest *request){
+  _state = RESPONSE_HEADERS;
+  String out = _assembleHead(request->version());
+  size_t outLen = out.length();
+  size_t space = request->client()->space();
+  if(!_contentLength && space >= outLen){
+    request->client()->write(out.c_str(), outLen);
+    _state = RESPONSE_WAIT_ACK;
+  } else if(_contentLength && space >= outLen + _contentLength){
+    out += _content;
+    outLen += _contentLength;
+    request->client()->write(out.c_str(), outLen);
+    _state = RESPONSE_WAIT_ACK;
+  } else if(space && space < out.length()){
+    String partial = out.substring(0, space);
+    _content = out.substring(space) + _content;
+    _contentLength += outLen - space;
+    request->client()->write(partial.c_str(), partial.length());
+    _state = RESPONSE_CONTENT;
+  } else if(space > outLen && space < (outLen + _contentLength)){
+    size_t shift = space - outLen;
+    outLen += shift;
+    _sentLength += shift;
+    out += _content.substring(0, shift);
+    _content = _content.substring(shift);
+    request->client()->write(out.c_str(), outLen);
+    _state = RESPONSE_CONTENT;
+  } else {
+    _content = out + _content;
+    _contentLength += outLen;
+    _state = RESPONSE_CONTENT;
+  }
+}
+
+size_t AsyncBasicResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+  _ackedLength += len;
+  if(_state == RESPONSE_CONTENT){
+    size_t available = _contentLength - _sentLength;
+    size_t space = request->client()->space();
+    //we can fit in this packet
+    if(space > available){
+      request->client()->write(_content.c_str(), available);
+      _content = String();
+      _state = RESPONSE_WAIT_ACK;
+      return available;
+    }
+    //send some data, the rest on ack
+    String out = _content.substring(0, space);
+    _content = _content.substring(space);
+    _sentLength += space;
+    request->client()->write(out.c_str(), space);
+    return space;
+  } else if(_state == RESPONSE_WAIT_ACK){
+    if(_ackedLength >= (_headLength+_contentLength)){
+      _state = RESPONSE_END;
+    }
+  }
+  return 0;
+}
+
+
+/*
+ * Abstract Response
+ * */
+
+void AsyncAbstractResponse::_respond(AsyncWebServerRequest *request){
+  addHeader("Connection","close");
+  _head = _assembleHead(request->version());
+  _state = RESPONSE_HEADERS;
+  _ack(request, 0, 0);
+}
+
+size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, uint32_t time){
+  if(!_sourceValid()){
+    _state = RESPONSE_FAILED;
+    request->client()->close();
+    return 0;
+  }
+  _ackedLength += len;
+  size_t space = request->client()->space();
+
+  size_t headLen = _head.length();
+  if(_state == RESPONSE_HEADERS){
+    if(space >= headLen){
+      _state = RESPONSE_CONTENT;
+      space -= headLen;
+    } else {
+      String out = _head.substring(0, space);
+      _head = _head.substring(space);
+      request->client()->write(out.c_str(), out.length());
+      return out.length();
+    }
+  }
+
+  if(_state == RESPONSE_CONTENT){
+    size_t outLen;
+    if(_chunked || !_sendContentLength){
+      outLen = space;
+    } else {
+      outLen = ((_contentLength - _sentLength) > space)?space:(_contentLength - _sentLength);
+    }
+
+    uint8_t *buf = (uint8_t *)malloc(outLen+headLen);
+    if (!buf) {
+      // os_printf("_ack malloc %d failed\n", outLen+headLen);
+      return 0;
+    }
+
+    if(headLen){
+      sprintf((char*)buf, "%s", _head.c_str());
+      _head = String();
+    }
+
+    size_t readLen = 0;
+
+    if(_chunked){
+      readLen = _fillBuffer(buf+headLen, outLen - 8);
+      char pre[6];
+      sprintf(pre, "%x\r\n", readLen);
+      size_t preLen = strlen(pre);
+      memmove(buf+headLen+preLen, buf+headLen, readLen);
+      for(size_t i=0; i<preLen; i++)
+        buf[i+headLen] = pre[i];
+      outLen = preLen + readLen + headLen;
+      buf[outLen++] = '\r';
+      buf[outLen++] = '\n';
+    } else {
+      outLen = _fillBuffer(buf+headLen, outLen) + headLen;
+    }
+
+    if(outLen)
+      outLen = request->client()->write((const char*)buf, outLen);
+
+    if(_chunked)
+      _sentLength += readLen;
+    else
+      _sentLength += outLen - headLen;
+
+    free(buf);
+
+    if((_chunked && readLen == 0) || (!_sendContentLength && outLen == 0) || _sentLength == _contentLength){
+      _state = RESPONSE_WAIT_ACK;
+    }
+    return outLen;
+
+  } else if(_state == RESPONSE_WAIT_ACK){
+    if(!_sendContentLength || _ackedLength >= (_headLength+_contentLength)){
+      _state = RESPONSE_END;
+      if(!_chunked && !_sendContentLength)
+        request->client()->close(true);
+    }
+  }
+  return 0;
+}
+
+
+
+
+/*
+ * File Response
+ * */
+
+AsyncFileResponse::~AsyncFileResponse(){
+  if(_content)
+    _content.close();
+}
+
+void AsyncFileResponse::_setContentType(String path){
+  if (path.endsWith(".html")) _contentType = "text/html";
+  else if (path.endsWith(".htm")) _contentType = "text/html";
+  else if (path.endsWith(".css")) _contentType = "text/css";
+  else if (path.endsWith(".js")) _contentType = "application/javascript";
+  else if (path.endsWith(".png")) _contentType = "image/png";
+  else if (path.endsWith(".gif")) _contentType = "image/gif";
+  else if (path.endsWith(".jpg")) _contentType = "image/jpeg";
+  else if (path.endsWith(".ico")) _contentType = "image/x-icon";
+  else if (path.endsWith(".svg")) _contentType = "image/svg+xml";
+  else if (path.endsWith(".xml")) _contentType = "text/xml";
+  else if (path.endsWith(".pdf")) _contentType = "application/pdf";
+  else if (path.endsWith(".zip")) _contentType = "application/zip";
+  else if(path.endsWith(".gz")) _contentType = "application/x-gzip";
+  else _contentType = "text/plain";
+}
+
+AsyncFileResponse::AsyncFileResponse(FS &fs, String path, String contentType, bool download){
+  _code = 200;
+  _path = path;
+
+  if(!download && !fs.exists(_path) && fs.exists(_path+".gz")){
+    _path = _path+".gz";
+    addHeader("Content-Encoding", "gzip");
+  }
+
+  _content = fs.open(_path, "r");
+  _contentLength = _content.size();
+
+  if(contentType == "")
+    _setContentType(path);
+  else
+    _contentType = contentType;
+
+  int filenameStart = path.lastIndexOf('/') + 1;
+  char buf[26+path.length()-filenameStart];
+  char* filename = (char*)path.c_str() + filenameStart;
+
+  if(download) {
+    // set filename and force download
+    snprintf(buf, sizeof (buf), "attachment; filename=\"%s\"", filename);
+  } else {
+    // set filename and force rendering
+    snprintf(buf, sizeof (buf), "inline; filename=\"%s\"", filename);
+  }
+  addHeader("Content-Disposition", buf);
+
+}
+
+AsyncFileResponse::AsyncFileResponse(File content, String path, String contentType, bool download){
+  _code = 200;
+  _path = path;
+  _content = content;
+  _contentLength = _content.size();
+
+  if(!download && String(_content.name()).endsWith(".gz"))
+    addHeader("Content-Encoding", "gzip");
+
+  if(contentType == "")
+    _setContentType(path);
+  else
+    _contentType = contentType;
+
+  int filenameStart = path.lastIndexOf('/') + 1;
+  char buf[26+path.length()-filenameStart];
+  char* filename = (char*)path.c_str() + filenameStart;
+
+  if(download) {
+    snprintf(buf, sizeof (buf), "attachment; filename=\"%s\"", filename);
+  } else {
+    snprintf(buf, sizeof (buf), "inline; filename=\"%s\"", filename);
+  }
+  addHeader("Content-Disposition", buf);
+}
+
+size_t AsyncFileResponse::_fillBuffer(uint8_t *data, size_t len){
+  _content.read(data, len);
+  return len;
+}
+
+/*
+ * Stream Response
+ * */
+
+AsyncStreamResponse::AsyncStreamResponse(Stream &stream, String contentType, size_t len){
+  _code = 200;
+  _content = &stream;
+  _contentLength = len;
+  _contentType = contentType;
+}
+
+size_t AsyncStreamResponse::_fillBuffer(uint8_t *data, size_t len){
+  size_t available = _content->available();
+  size_t outLen = (available > len)?len:available;
+  size_t i;
+  for(i=0;i<outLen;i++)
+    data[i] = _content->read();
+  return outLen;
+}
+
+/*
+ * Callback Response
+ * */
+
+AsyncCallbackResponse::AsyncCallbackResponse(String contentType, size_t len, AwsResponseFiller callback){
+  _code = 200;
+  _content = callback;
+  _contentLength = len;
+  if(!len)
+    _sendContentLength = false;
+  _contentType = contentType;
+}
+
+size_t AsyncCallbackResponse::_fillBuffer(uint8_t *data, size_t len){
+  return _content(data, len, _sentLength);
+}
+
+/*
+ * Chunked Response
+ * */
+
+AsyncChunkedResponse::AsyncChunkedResponse(String contentType, AwsResponseFiller callback){
+  _code = 200;
+  _content = callback;
+  _contentLength = 0;
+  _contentType = contentType;
+  _sendContentLength = false;
+  _chunked = true;
+}
+
+size_t AsyncChunkedResponse::_fillBuffer(uint8_t *data, size_t len){
+  return _content(data, len, _sentLength);
+}
+
+/*
+ * Progmem Response
+ * */
+
+AsyncProgmemResponse::AsyncProgmemResponse(int code, String contentType, const uint8_t * content, size_t len){
+  _code = code;
+  _content = content;
+  _contentType = contentType;
+  _contentLength = len;
+}
+
+size_t AsyncProgmemResponse::_fillBuffer(uint8_t *data, size_t len){
+  size_t left = _contentLength - _sentLength;
+    if (left > len) {
+      memcpy_P(data, _content + _sentLength, len);
+      return len;
+    }
+    memcpy_P(data, _content + _sentLength, left);
+    return left;
+}
+
+
+/*
+ * Response Stream (You can print/write/printf to it, up to the contentLen bytes)
+ * */
+
+AsyncResponseStream::AsyncResponseStream(String contentType, size_t bufferSize){
+  _code = 200;
+  _contentLength = 0;
+  _contentType = contentType;
+  _content = new cbuf(bufferSize);
+}
+
+AsyncResponseStream::~AsyncResponseStream(){
+  delete _content;
+}
+
+size_t AsyncResponseStream::_fillBuffer(uint8_t *buf, size_t maxLen){
+  return _content->read((char*)buf, maxLen);
+}
+
+size_t AsyncResponseStream::write(const uint8_t *data, size_t len){
+  if(_started())
+    return 0;
+
+  if(len > _content->room()){
+    size_t needed = len - _content->room();
+    _content->resizeAdd(needed);
+  }
+  size_t written = _content->write((const char*)data, len);
+  _contentLength += written;
+  return written;
+}
+
+size_t AsyncResponseStream::write(uint8_t data){
+  return write(&data, 1);
+}
diff --git a/libraries/ESPAsyncWebServer-master/src/WebServer.cpp b/libraries/ESPAsyncWebServer-master/src/WebServer.cpp
new file mode 100644
index 0000000..882fe15
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/src/WebServer.cpp
@@ -0,0 +1,172 @@
+/*
+  Asynchronous WebServer library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "ESPAsyncWebServer.h"
+#include "WebHandlerImpl.h"
+
+
+AsyncWebServer::AsyncWebServer(uint16_t port):_server(port), _rewrites(0), _handlers(0){
+  _catchAllHandler = new AsyncCallbackWebHandler();
+  if(_catchAllHandler == NULL)
+    return;
+  _server.onClient([](void *s, AsyncClient* c){
+    if(c == NULL)
+      return;
+    AsyncWebServerRequest *r = new AsyncWebServerRequest((AsyncWebServer*)s, c);
+    if(r == NULL){
+      c->close(true);
+      c->free();
+      delete c;
+    }
+  }, this);
+}
+
+AsyncWebServer::~AsyncWebServer(){
+  while(_rewrites != NULL){
+    AsyncWebRewrite *r = _rewrites;
+    _rewrites = r->next;
+    delete r;
+  }
+  while(_handlers != NULL){
+    AsyncWebHandler *h = _handlers;
+    _handlers = h->next;
+    delete h;
+  }
+  if (_catchAllHandler != NULL){
+    delete _catchAllHandler;
+  }
+}
+
+AsyncWebRewrite& AsyncWebServer::addRewrite(AsyncWebRewrite* rewrite){
+  if (_rewrites == NULL){
+    _rewrites = rewrite;
+  } else {
+    AsyncWebRewrite *r = _rewrites;
+    while(r->next != NULL) r = r->next;
+    r->next = rewrite;
+  }
+  return *rewrite;
+}
+
+AsyncWebRewrite& AsyncWebServer::rewrite(const char* from, const char* to){
+  return addRewrite(new AsyncWebRewrite(from, to));
+}
+
+AsyncWebHandler& AsyncWebServer::addHandler(AsyncWebHandler* handler){
+  if(_handlers == NULL){
+    _handlers = handler;
+  } else {
+    AsyncWebHandler* h = _handlers;
+    while(h->next != NULL) h = h->next;
+    h->next = handler;
+  }
+  return *handler;
+}
+
+void AsyncWebServer::begin(){
+  _server.begin();
+}
+
+void AsyncWebServer::_handleDisconnect(AsyncWebServerRequest *request){
+  delete request;
+}
+
+void AsyncWebServer::_rewriteRequest(AsyncWebServerRequest *request){
+  AsyncWebRewrite *r = _rewrites;
+  while(r){
+    if (r->from() == request->_url && r->filter(request)){
+      request->_url = r->toUrl();
+      request->_addGetParams(r->params());
+    }
+    r = r->next;
+  }
+}
+
+void AsyncWebServer::_attachHandler(AsyncWebServerRequest *request){
+  if(_handlers){
+    AsyncWebHandler* h = _handlers;
+    while(h){
+      if (h->filter(request) && h->canHandle(request)){
+        request->setHandler(h);
+        return;
+      }
+      h = h->next;
+    }
+  }
+  request->addInterestingHeader("ANY");
+  request->setHandler(_catchAllHandler);
+}
+
+
+AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethod method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload, ArBodyHandlerFunction onBody){
+  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
+  handler->setUri(uri);
+  handler->setMethod(method);
+  handler->onRequest(onRequest);
+  handler->onUpload(onUpload);
+  handler->onBody(onBody);
+  addHandler(handler);
+  return *handler;
+}
+
+AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethod method, ArRequestHandlerFunction onRequest, ArUploadHandlerFunction onUpload){
+  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
+  handler->setUri(uri);
+  handler->setMethod(method);
+  handler->onRequest(onRequest);
+  handler->onUpload(onUpload);
+  addHandler(handler);
+  return *handler;
+}
+
+AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, WebRequestMethod method, ArRequestHandlerFunction onRequest){
+  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
+  handler->setUri(uri);
+  handler->setMethod(method);
+  handler->onRequest(onRequest);
+  addHandler(handler);
+  return *handler;
+}
+
+AsyncCallbackWebHandler& AsyncWebServer::on(const char* uri, ArRequestHandlerFunction onRequest){
+  AsyncCallbackWebHandler* handler = new AsyncCallbackWebHandler();
+  handler->setUri(uri);
+  handler->onRequest(onRequest);
+  addHandler(handler);
+  return *handler;
+}
+
+AsyncStaticWebHandler& AsyncWebServer::serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_control){
+  AsyncStaticWebHandler* handler = new AsyncStaticWebHandler(uri, fs, path, cache_control);
+  addHandler(handler);
+  return *handler;
+}
+
+void AsyncWebServer::onNotFound(ArRequestHandlerFunction fn){
+  ((AsyncCallbackWebHandler*)_catchAllHandler)->onRequest(fn);
+}
+
+void AsyncWebServer::onFileUpload(ArUploadHandlerFunction fn){
+  ((AsyncCallbackWebHandler*)_catchAllHandler)->onUpload(fn);
+}
+
+void AsyncWebServer::onRequestBody(ArBodyHandlerFunction fn){
+  ((AsyncCallbackWebHandler*)_catchAllHandler)->onBody(fn);
+}
diff --git a/libraries/ESPAsyncWebServer-master/travis/common.sh b/libraries/ESPAsyncWebServer-master/travis/common.sh
new file mode 100644
index 0000000..57bede3
--- /dev/null
+++ b/libraries/ESPAsyncWebServer-master/travis/common.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+function build_sketches()
+{
+    local arduino=$1
+    local srcpath=$2
+    local platform=$3
+    local sketches=$(find $srcpath -name *.ino)
+    for sketch in $sketches; do
+        local sketchdir=$(dirname $sketch)
+        if [[ -f "$sketchdir/.$platform.skip" ]]; then
+            echo -e "\n\n ------------ Skipping $sketch ------------ \n\n";
+            continue
+        fi
+        echo -e "\n\n ------------ Building $sketch ------------ \n\n";
+        $arduino --verify $sketch;
+        local result=$?
+        if [ $result -ne 0 ]; then
+            echo "Build failed ($1)"
+            return $result
+        fi
+    done
+}
diff --git a/libraries/Expression_Parser/README.md b/libraries/Expression_Parser/README.md
deleted file mode 100644
index 46bcdb9..0000000
--- a/libraries/Expression_Parser/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-expression_parser
-=================
-
-A simple C expression parser.  Hand-rolled recursive descent style algorithm implements the parser, removing the need for external tools such as lex/yacc. Reads mathematical expression in infix notation (with a few built-in mathematical functions) and produces double-precision results.  
- 
- The library handles:
- 
- - standard arithmetic operations (+,-,*,/) with operator precedence
- - exponentiation ^ and nested exponentiation
- - unary + and -
- - expressions enclosed in parentheses ('(',')'), optionally nested
- - built-in math functions: pow(x,y), sqrt(x), log(x), exp(x), sin(x), asin(x),
- cos(x), acos(x), tan(x), atan(x), atan2(y,x), abs(x), fabs(x), floor(x),
- ceil(x), round(x), with input arguments checked for domain validity, e.g.
- 'sqrt( -1.0 )' returns an error.
- - standard boolean operations (==,!=,>,<,>=,<=,&&,||,!) using the convention
- that False := fabs(value) <= PARSER_BOOLEAN_EQUALITY_THRESHOLD and
- True = !False := fabs(value) > PARSER_BOOLEAN_EQUALITY_THRESHOLD
- - predefined named variables and functions via a callback interface (see below)
- 
-Operator precedence and syntax matches the C language as closely as possible to allow straightforward validation of code-correctness.  I.e. the parser should produce the same result as the C language to within rounding errors when only operations from C are used.
- 
-Boolean operations may be excluded by defining the preprocessor symbol PARSER_EXCLUDE_BOOLEAN_OPS.
- 
-The library is also thread safe, allowing multiple parsers to be operated (on  different inputs) simultaneously.
- 
-Error handling is achieved using the setjmp() and longjmp() commands. To the best of my knowledge these are available on nearly all platforms, including embedded, platforms so the library should run happily even on AVRs (this has not been tested).
- 
-Licence: GPLv2 for non-commercial use. Contact me for commercial licensing. This code is provided as-is, with no warranty whatsoever.
- 
-Predefined variables and functions are accomodated with a callback interface that allows driver code to look up named variables and evaluate functions as required by the parser.  These callbacks must match the call-signature for the parser_variable_callback and parser_function_callback types below.  The variable callback takes the name of the variable to be looked up and returns true if the named variable value was copied into the output argument, returning false otherwise.  The function callback operates similarly, taking the name of the function to evaluate as well as a list of arguments to that function and (if successful) placing the evaluated function value in the return argument and returning true.  Function calls may be arbitrarily nested.
diff --git a/libraries/Expression_Parser/expression_parser_string.cpp b/libraries/Expression_Parser/expression_parser_string.cpp
deleted file mode 100644
index 09ba178..0000000
--- a/libraries/Expression_Parser/expression_parser_string.cpp
+++ /dev/null
@@ -1,1050 +0,0 @@
-#include <math.h>
-#include <stdio.h>
-#include <String.h>
-#include <stdlib.h>
-
-#include <arduino.h>
-
-/**
- @file expression_parser.c
- @author James Gregson (james.gregson@gmail.com)
- @brief implementation of the mathematical expression parser, see expression_parser.h for more information and license terms.
- @
- @author CiccioCB March 2016
- @implementation of string parsing, including literals, variables and functions
- @changes on the functions permitting to recognize the kind of result returned by the expression (number or string)
-*/
-using namespace std;
-
-extern char* _parser_error_msg;
-
-#include "expression_parser_string.h"
-
-int ICACHE_FLASH_ATTR parse_expression( const char *expr, PARSER_PREC *value, String &value_str )
- {
- 	return parse_expression_with_callbacks( expr, NULL, NULL, NULL, value, value_str );
- }
-
-int ICACHE_FLASH_ATTR parse_expression_with_callbacks( const char *expr, parser_variable_callback variable_cb, parser_function_callback function_cb, void *user_data, PARSER_PREC *value, String &str_value ){
-	int r;
-	parser_data pd;
-	parser_data_init( &pd, expr, variable_cb, function_cb, user_data );
-	r = parser_parse( &pd, value, str_value );
-	if( pd.error ){
-		//printf("Error: %s\n", pd.error );
-		//printf("Expression '%s' failed to parse, returning nan\n", expr );
-	}
-	_parser_error_msg = (char *) pd.error;
-	return r;	  
-}
-
-int ICACHE_FLASH_ATTR parser_data_init( parser_data *pd, const char *str, parser_variable_callback variable_cb, parser_function_callback function_cb, void *user_data ){
-	pd->str = str;
-	pd->len = strlen( str )+1;
-	pd->pos = 0;
-	pd->error = NULL;
-	pd->user_data   = user_data;
-	pd->variable_cb = variable_cb;
-	pd->function_cb = function_cb;
-	return PARSER_TRUE;
-}
-
-
-int ICACHE_FLASH_ATTR parser_parse( parser_data *pd, PARSER_PREC *value, String &str_value ){
-    //PARSER_PREC result = 0.0;
-	int r;
-	// set the jump position and launch the parser
-	//if( !setjmp( pd->err_jmp_buf ) ){
-    if (1){
-#if !defined(PARSER_EXCLUDE_BOOLEAN_OPS)
-		r = parser_read_boolean_or( pd, value, str_value );
-#else
-		r = parser_read_expr( pd, value, str_value );
-#endif
-        parser_eat_whitespace( pd );
-        if( pd->pos < pd->len-1 )
-		{
-            parser_error( pd, PSTR("Failed to reach end of input expression, likely malformed input") );
-        }
-		else
-		{
-			//*value = result;
-			return r;
-		}
-	}
-	else 
-	{
-		// error was returned, output a nan silently
-		*value =  sqrt(-1.0);
-		return PARSER_FALSE;
-	}
-	*value =  sqrt(-1.0);
-	return PARSER_FALSE;
-}
-									   
-void ICACHE_FLASH_ATTR parser_error( parser_data *pd, const char *err ){
-	pd->error = err;
-	//longjmp( pd->err_jmp_buf, 1);
-}
-
-char ICACHE_FLASH_ATTR parser_peek( parser_data *pd ){
-delay(0);
-	if( pd->pos < pd->len )
-	{
-		return pd->str[pd->pos];
-	}
-	parser_error( pd, PSTR("Tried to read past end of String!" ));
-	return '\0';
-}
-
-char ICACHE_FLASH_ATTR parser_peek_n( parser_data *pd, int n ){
-delay(0);
-	if( pd->pos+n < pd->len )
-		return pd->str[pd->pos+n];
-	parser_error( pd, PSTR("Tried to read past end of String!" ));
-	return '\0';
-}
-
-char ICACHE_FLASH_ATTR parser_eat( parser_data *pd ){
-delay(0);
-	if( pd->pos < pd->len )
-		return pd->str[pd->pos++];
-	parser_error( pd, PSTR("Tried to read past end of String!" ));
-	return '\0';
-}
-
-void ICACHE_FLASH_ATTR parser_eat_whitespace( parser_data *pd ){
-delay(0);
-	while( isspace( parser_peek( pd ) ) )
-		parser_eat( pd );
-}
-
-int ICACHE_FLASH_ATTR parser_read_Value( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	char c;
-	char *token; //[PARSER_MAX_TOKEN_SIZE];
-	int pos=0;
-	//PARSER_PREC val=0.0;
-	*value = 0.0;
-	token = (char*) malloc(PARSER_MAX_TOKEN_SIZE); // allocate memory 
-	
-	// read a leading sign
-	c = parser_peek( pd );
-	if( c == '+' || c == '-' )
-		token[pos++] = parser_eat( pd );
-
-	// read optional digits leading the decimal point
-	while( isdigit(parser_peek(pd)) )
-		token[pos++] = parser_eat( pd );
-
-	// read the optional decimal point
-	c = parser_peek( pd );
-	if( c == '.' )
-		token[pos++] = parser_eat( pd );
-
-	// read optional digits after the decimal point
-	while( isdigit(parser_peek(pd)) )
-		token[pos++] = parser_eat( pd );
-
-	// read the exponent delimiter
-	c = parser_peek( pd );
-	if( c == 'e' || c == 'E' ){
-		token[pos++] = parser_eat( pd );
-
-		// check if the expoentn has a sign,
-		// if so, read it 
-		c = parser_peek( pd );
-		if( c == '+' || c == '-' ){
-			token[pos++] = parser_eat( pd );
-		}
-	}
-
-	// read the exponent delimiter
-	while( isdigit(parser_peek(pd) ) )
-		token[pos++] = parser_eat( pd );
-
-	// remove any trailing whitespace
-	parser_eat_whitespace( pd );
-
-	// null-terminate the String
-	token[pos] = '\0';
-
-  // cicciocb TBD : replace the atof with a more efficient function
-  // and insert a more strict control on the double-precision format
-  *value = atof(token);
-	// check that a double-precision was read, otherwise throw an error
-	//if( pos == 0) || sscanf( token, "%lf", &val ) != 1 )
-  if( (pos == 0))// || (token[0] != '0' ) )
-	{
-		//parser_error( pd, "Failed to read real number" );
-																						      //printf("Failed to read real number" );
-		// now try to analyze if is a string;
-		//the string is defined as the text between " or | using | you can put " inside strings (and vice-versa)
-		// read a leading sign
-		c = parser_peek( pd );
-		if( c == '"' || c == '|')
-			parser_eat( pd );
-
-		// read optional chars until next " or |
-		while( (parser_peek(pd) != c) && (parser_peek(pd) != '\0') ) // stop if the end of String is reached
-			token[pos++] = parser_eat( pd );
-
-		// consume the final " or |
-		parser_eat( pd );
-		token[pos] = '\0';
-		// return the parsed value
-		str_value = String(token);
-		free(token);	// free alllocated memory
-		// return the status
-		return PARSER_STRING;
-	}
-
-	// return the parsed value
-	//*value = val;
-	free(token);	// free alllocated memory
-	// return the status
-	return PARSER_TRUE;
-}
-int ICACHE_FLASH_ATTR parser_read_argument( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	char c;
-	int r;
-	// eat leading whitespace
-	parser_eat_whitespace( pd );
-	
-	// read the argument
-	r = parser_read_expr( pd, value, str_value );
-	
-	// read trailing whitespace
-	parser_eat_whitespace( pd );
-	
-	// check if there's a comma
-	c = parser_peek( pd );
-	if( c == ',' )
-		parser_eat( pd );
-	
-	// eat trailing whitespace
-	parser_eat_whitespace( pd );
-	
-	// return status
-	return r;
-
-}
-
-int ICACHE_FLASH_ATTR parser_read_argument_list( parser_data *pd, int *num_args, PARSER_PREC *args, String **args_str){
-	char c;
-	int r = PARSER_FALSE; // in case the argument is empty as fun(), the return value will be PARSER_FALSE
-	// set the initial number of arguments to zero
-	*num_args = 0;
-	//Serial.println("parser_read_argument_list");
-	// eat any leading whitespace
-	parser_eat_whitespace( pd );
-	while( parser_peek( pd ) != ')' ){
-		// check that we haven't read too many arguments
-		if( *num_args >= PARSER_MAX_ARGUMENT_COUNT )
-			parser_error( pd, PSTR("Exceeded maximum argument count for function call, increase PARSER_MAX_ARGUMENT_COUNT and recompile!" ));
-		
-		// read the argument and add it to the list of arguments
-		String ss = "";
-		//r = parser_read_expr( pd, &args[*num_args], &ss );
-		r = parser_read_expr( pd, &args[*num_args], ss );
-		// here we try to characterize each element; we could add another array to store the kind of argument available (Double or String)
-		// but we can simply put a nan when the arg is a String and a '\0' when the arg is a Number
- 		if (r == PARSER_STRING)
-		{
-			args[*num_args] = sqrt(-1); // nan
-			args_str[*num_args] = new String(ss);
-		}
-		else
-			args_str[*num_args] = NULL;	// this means that the arg is not valid!
- 
-		*num_args = *num_args+1;
-		// eat any following whitespace
-		parser_eat_whitespace( pd );
-	
-		// check the next character
-		c = parser_peek( pd );
-		if( c == ')' ){
-			// closing parenthesis, end of argument list, return
-			// and allow calling function to match the character
-			break;
-	    } else if( c == ',' ){
-			// comma, indicates another argument follows, match
-			// the comma, eat any remaining whitespace and continue
-			// parsing arguments
-			parser_eat( pd );
-			parser_eat_whitespace( pd );
-		} else {
-			// invalid character, print an error and return
-			parser_error( pd, PSTR("Expected ')' or ',' in function argument list!" ));
-			return PARSER_FALSE;
-		}
-	}
-	return r;
-}
-
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-// This is a C99 compiler - use the built-in round function.
-#else
-// This is not a C99-compliant compiler - roll our own round function.
-// We'll use a name different from round in case this compiler has a non-standard implementation.
-int ICACHE_FLASH_ATTR parser_round(PARSER_PREC x){
-	int i = (int) x;
-	if (x >= 0.0) {
-		return ((x-i) >= 0.5) ? (i + 1) : (i);
-	} else {
-		return (-x+i >= 0.5) ? (i - 1) : (i);
-	}
-}
-#endif
-
-
-int ICACHE_FLASH_ATTR parser_read_builtin( parser_data *pd, PARSER_PREC *value, String &str_value ){
-		
-	char c;
-	char *token;//[PARSER_MAX_TOKEN_SIZE];
-	int num_args, pos=0;
-	int r;
-	//PARSER_PREC v0=0.0, v1=0.0, args[PARSER_MAX_ARGUMENT_COUNT];
-	PARSER_PREC v0 = 0.0, v1 = 1.0;
-	PARSER_PREC args[PARSER_MAX_ARGUMENT_COUNT];
-	
-	//PARSER_PREC *args = (PARSER_PREC*) malloc(PARSER_MAX_ARGUMENT_COUNT*sizeof(PARSER_PREC));
-	
-	String v1_str=""; // args_str[PARSER_MAX_ARGUMENT_COUNT];
-	String *args_str[PARSER_MAX_ARGUMENT_COUNT];
-	// put a null for each element; this will permit to recognise the elements created
-	for (int i=0; i<PARSER_MAX_ARGUMENT_COUNT; i++)
-		args_str[i] = NULL;
-
-	token = (char*) malloc(PARSER_MAX_TOKEN_SIZE); // allocate memory 
-	c = parser_peek( pd );
-
-	if( isalpha(c) || c == '_' ){
-		// alphabetic character or underscore, indicates that either a function 
-		// call or variable follows
-		while( isalpha(c) || isdigit(c) || c == '_' || c == '.' || c == '$') {  // the variable/function can contains a point in the name as my.port.id or the $ as A$
-			token[pos++] = parser_eat( pd );
-			c = parser_peek( pd );
-		}
-		token[pos] = '\0';
-		// check for an opening bracket, which indicates a function call
-		if( parser_peek(pd) == '(' ){
-			// eat the bracket
-			parser_eat(pd);
-			// start handling the specific built-in functions
- 			if( strcmp_P( token, PSTR("pow") ) == 0 ){
-				r = parser_read_argument( pd, &v0, str_value );
-				r = parser_read_argument( pd, &v1, str_value );
-				v0 = pow( v0, v1 ); 
- 			} else if( strcmp_P( token, PSTR("sqr") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				if( v0 < 0.0 ) 
- 					parser_error( pd, PSTR("sqrt(x) undefined for x < 0!" ));
- 				v0 = sqrt( v0 );
- 			} else if( strcmp_P( token, PSTR("log") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				if( v0 <= 0 )
- 					parser_error( pd, PSTR("log(x) undefined for x <= 0!" ));
- 				v0 = log( v0 );
- 			} else if( strcmp_P( token, PSTR("exp") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				v0 = exp( v0 );
- 			} else if( strcmp_P( token, PSTR("sin") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );	
-				if (r == PARSER_STRING)
-					parser_error( pd, PSTR("The argument must be a number!" ));
- 				v0 = sin( v0 );
- 			} else if( strcmp_P( token, PSTR("asin") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				if( fabs(v0) > 1.0 )
- 					parser_error( pd, PSTR("asin(x) undefined for |x| > 1!" ));
- 				v0 = asin( v0 );
- 			} else if( strcmp_P( token, PSTR("cos") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				v0 = cos( v0 );
- 			} else if( strcmp_P( token, PSTR("acos") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				if( fabs(v0 ) > 1.0 )
- 					parser_error( pd, PSTR("acos(x) undefined for |x| > 1!" ));
- 				v0 = acos( v0 );
- 			} else if( strcmp_P( token, PSTR("tan") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );	
- 				v0 = tan( v0 );
- 			} else if( strcmp_P( token, PSTR("atan") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				v0 = atan( v0 );
- 			} else if( strcmp_P( token, PSTR("atan2") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				r = parser_read_argument( pd, &v1, str_value );
- 				v0 = atan2( v0, v1 );
- 			} else if( strcmp_P( token, PSTR("abs") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				v0 = abs( (int)v0 );
- 			} else if( strcmp_P( token, PSTR("fabs") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				v0 = fabs( v0 );
- 			} else if( strcmp_P( token, PSTR("floor") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				v0 = floor( v0 );
- 			} else if( strcmp_P( token, PSTR("ceil") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- 				v0 = floor( v0 );
- 			} else if( strcmp_P( token, PSTR("round") ) == 0 ){
- 				r = parser_read_argument( pd, &v0, str_value );
- #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
- 				// This is a C99 compiler - use the built-in round function.
- 				v0 = round( v0 );
- #else
- 				// This is not a C99-compliant compiler - use our own round function.
- 				v0 = parser_round( v0 );
- #endif
-		 } else {
-				r = parser_read_argument_list( pd, &num_args, args, args_str);
-				delay(0);
-				if( pd->function_cb && (r = pd->function_cb( pd->user_data, token, num_args, args, &v1, args_str, &v1_str)) ){
-					v0 = v1;
-					str_value = v1_str;
-				} else {
-					parser_error( pd, PSTR("Tried to call unknown built-in function!" ));
-				}
-				// delete all allocated String arguments
-				for (int i=0; i<num_args; i++)
-					delete args_str[i];	
-				// free the allocated memory
-				//free(args);
-			}
-		
-			// eat closing bracket of function call
-			if( parser_eat( pd ) != ')' )
-				parser_error( pd, PSTR("Expected ')' in built-in call!" ));
-		} else {
-			// no opening bracket, indicates a variable lookup
-			if( pd->variable_cb != NULL && (r = pd->variable_cb( pd->user_data, token, &v1, &v1_str )) ){
-					v0 = v1;
-					str_value = v1_str;
-			} else {
-				parser_error( pd, PSTR("Could not look up value for variable!" ));
-			}
-		}
-	} else {
-		// not a built-in function call, just read a literal double or string
-		int r = parser_read_Value( pd, value, str_value);
-		// consume whitespace
-		parser_eat_whitespace( pd );
-		
-		free(token); // free the allocated memory
-		return r;
-	}
-	
-	// consume whitespace
-	parser_eat_whitespace( pd );
-	
-	*value = v0;
-	// return the status
-	
-	free(token); // free the allocated memory
-	return r;
-}
-
-int ICACHE_FLASH_ATTR parser_read_paren( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	PARSER_PREC val;
-	int r;
-
-	// check if the expression has a parenthesis
-	if( parser_peek( pd ) == '(' ){
-		// eat the character
-		parser_eat( pd );
-		
-		// eat remaining whitespace
-		parser_eat_whitespace( pd );
-		
-		// if there is a parenthesis, read it 
-		// and then read an expression, then
-		// match the closing brace
-		r = parser_read_boolean_or( pd, &val, str_value );
-		
-		// consume remaining whitespace
-		parser_eat_whitespace( pd );
-		
-		// match the closing brace
-		if( parser_peek(pd) != ')' )
-			parser_error( pd, PSTR("Expected ')'!" ));		
-		parser_eat(pd);
-	} else {
-		// otherwise just read a literal value
-		r = parser_read_builtin( pd, value, str_value );
-		return r;
-	}
-	// eat following whitespace
-	parser_eat_whitespace( pd );
-
-	*value = val;
-
-	// return the status
-	return r;
-}
-
-int ICACHE_FLASH_ATTR parser_read_unary( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	char c;
-	int r;
-	PARSER_PREC v0;
-	c = parser_peek( pd );
-	if ( ( c == '!' ) || (strncmp_P(&pd->str[pd->pos], PSTR("not"), 3) == 0) ){
-		// if the first character is a '!', perform a boolean not operation
-#if !defined(PARSER_EXCLUDE_BOOLEAN_OPS)
-		if (c == 'n')
-		{
-			// 'not' is found. Remove 2 chars
-			pd->pos += 2;
-		}
-		parser_eat(pd);
-		parser_eat_whitespace(pd);
-		r = parser_read_paren(pd, &v0, str_value);
-//		v0 = fabs(v0) >= PARSER_BOOLEAN_EQUALITY_THRESHOLD ? 0.0 : 1.0;
-
-		// define a more "global" way to work; a binary 'not' is done on the operator
-		// this will permit to cover the comparaison and also the binary 'not' operator
-		v0 = ~((int) v0);
-
-#else
-		parser_error( pd, PSTR("Expected '+' or '-' for unary expression, got '!' or 'not'" ));
-#endif
-	} else if( c == '-' ){
-		// perform unary negation
-		parser_eat(pd);
-		parser_eat_whitespace(pd);
-		r = parser_read_paren(pd, &v0, str_value);
-		v0 = -v0;
-	} else if( c == '+' ){
-		// consume extra '+' sign and continue reading
-		parser_eat( pd );
-		parser_eat_whitespace(pd);
-		r = parser_read_paren(pd, &v0, str_value);
-	} else {
-		r = parser_read_paren(pd, &v0, str_value);
-	}
-	parser_eat_whitespace(pd);
-	*value = v0;
-	// return the status
-	return r;
-}
-
-int ICACHE_FLASH_ATTR parser_read_power( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	PARSER_PREC v0, v1=1.0, s=1.0;
-	int r;
-
-	// read the first operand
-	r = parser_read_unary( pd, &v0, str_value );
-	
-	// eat remaining whitespace
-	parser_eat_whitespace( pd );
-	
-	// attempt to read the exponentiation operator
-	while( parser_peek(pd) == '^' ){
-		parser_eat(pd );
-		
-		// eat remaining whitespace
-		parser_eat_whitespace( pd );
-		
-		// handles case of a negative immediately 
-		// following exponentiation but leading
-		// the parenthetical exponent
-		if( parser_peek( pd ) == '-' ){
-			parser_eat( pd );
-			s = -1.0;
-			parser_eat_whitespace( pd );
-		}
-		
-		// read the second operand
-		//v1 = s*parser_read_power( pd );
-		r = parser_read_power( pd, &v1, str_value );
-		v1 = v1 * s;
-		
-		// perform the exponentiation
-		v0 = pow( v0, v1 );
-		
-		// eat remaining whitespace
-		parser_eat_whitespace( pd );
-	}
-	
-	// return the result
-	*value = v0;
-	// return the status
-	return r;
-}
-
-int ICACHE_FLASH_ATTR parser_read_term( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	PARSER_PREC v0, v1;
-	char c;
-	int r;
-	// read the first operand
-	//v0 = parser_read_power( pd );
-	r = parser_read_power( pd, &v0, str_value );
-	
-	// eat remaining whitespace
-	parser_eat_whitespace( pd );
-	
-	// check to see if the next character is a
-	// multiplication, division, modulo operand (%) or shift left/right (<< or >>)
-	c = parser_peek( pd );
-	while( c == '*' || c == '/' || c == '%' ||
-		  (c == '<' && parser_peek_n(pd,1) == '<') || (c == '>' && parser_peek_n(pd,1) == '>') )
-	{
-		// eat the character
-		parser_eat( pd );
-		if ((c == '<') || (c == '>')) // if operator with 2 chars
-			parser_eat( pd );   // eat one more char
-		// eat remaining whitespace
-		parser_eat_whitespace( pd );
-		
-		// perform the appropriate operation
-		if( c == '*' ){
-			r = parser_read_power( pd, &v1, str_value );
-			v0 *= v1;
-		} else if( c == '/' ){
-			r = parser_read_power( pd, &v1, str_value );
-			v0 /= v1;
-		} else if( c == '%' ){
-			r = parser_read_power( pd, &v1, str_value );
-			v0 = (int)v0 % (int)v1;
-		} else if (c == '<'){
-			// this should be the << (shift left operator)
-			r = parser_read_power( pd, &v1, str_value );
-			v0 = (int)v0 << (int)v1;
-		} else if (c == '>'){
-			// this should be the >> (shift right operator)
-			r = parser_read_power( pd, &v1, str_value );
-			v0 = (int)v0 >> (int)v1;
-		}
-		
-		// eat remaining whitespace
-		parser_eat_whitespace( pd );
-		
-		// update the character
-		c = parser_peek( pd );
-	}
-
-	*value = v0;
-	// return the status
-	return r;
-}
-
-int ICACHE_FLASH_ATTR parser_read_expr( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	PARSER_PREC v0 = 0.0;
-	PARSER_PREC v1;
-	char c;
-	int r, r0;
-	String s0;
-	// handle unary minus
-	c = parser_peek( pd );
-	if( c == '+' || c == '-' ){
-		parser_eat( pd );
-		parser_eat_whitespace( pd );
-		if( c == '+' )
-		{
-			r = parser_read_term( pd, &v1, str_value );
-			v0 +=v1;
-		}
-		else 
-			if( c == '-' )
-			{
-				r = parser_read_term( pd, &v1, str_value );
-				v0 -=v1;
-			}
-	} 
-	else 
-	{
-		r = parser_read_term( pd, &v0, str_value );
-	}
-	parser_eat_whitespace( pd );
-	
-	// check if there is an addition or
-	// subtraction operation following
-	c = parser_peek( pd );			/* match & but not &&                   */
-	while( c == '+' || c == '-'  || (c == '&' && parser_peek_n(pd, 1) != '&') ){ 
-		// advance the input
-		parser_eat( pd );
-		
-		// eat any extra whitespace
-		parser_eat_whitespace( pd );
-		
-		// perform the operation
-		if( c == '+' )
-		{	
-			r0 = r;
-			s0 = str_value;
-			r = parser_read_term( pd, &v1, str_value );
-			/*		uncomment this part to permit to use the '+' operator also for the strings	
-			// if one of the arguments is string, the result will be a string
-			if ((r0 == PARSER_STRING) || (r == PARSER_STRING))
-			{
-				if (r == PARSER_TRUE)
-					str_value = s0 + FloatToString(v1);
-				else
-					if (r0 == PARSER_TRUE)
-						str_value = FloatToString(v0) + str_value;
-					else
-						str_value =  s0 + str_value;
-				r = PARSER_STRING;
-			}
-			else  // else the result is the numerical sum
-			*/
-				v0 +=v1;
-			r = PARSER_TRUE; // this needs to be removed if the '+' for strings is required
-		} 
-		else if ( c == '&' )
-			{
-				r0 = r;
-				s0 = str_value;
-				r = parser_read_term( pd, &v1, str_value );
-				// if one of the arguments is string, the result will be a string
-				if ((r0 == PARSER_STRING) || (r == PARSER_STRING))
-				{
-					if (r == PARSER_TRUE)
-						str_value = s0 +  FloatToString(v1);
-					else
-						if (r0 == PARSER_TRUE)
-							str_value =  FloatToString(v0) + str_value;
-						else
-							str_value =  s0 + str_value;
-					r = PARSER_STRING;
-				}
-				else
-				{
-					// these are Numeric terms so, we will add as they were strings
-					str_value = FloatToString(v0) + FloatToString(v1);
-					r = PARSER_STRING;
-				}
-		} 
-		else if( c == '-' )
-			{
-				r = parser_read_term( pd, &v1, str_value );
-				v0 -=v1;
-			}	
-		
-		// eat whitespace
-		parser_eat_whitespace( pd );
-		
-		// update the character being tested in the while loop
-		c = parser_peek( pd );
-	}
-	
-	// return expression result
-	*value = v0;
-
-	// return the status
-	return r;
-}
-
-
-
-int ICACHE_FLASH_ATTR parser_read_boolean_comparison( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	char c, oper[] = { '\0', '\0', '\0' };
-	PARSER_PREC v0, v1;
-	int r;
-	// eat whitespace
-	parser_eat_whitespace( pd );
-	
-	// read the first value
-	r = parser_read_expr( pd,  &v0, str_value);
-	
-	// eat trailing whitespace
-	parser_eat_whitespace( pd );
-	
-	// try to perform boolean comparison operator. Unlike the other operators
-	// like the arithmetic operations and the boolean and/or operations, we
-	// only allow one operation to be performed. This is done since cascading
-	// operations would have unintended results: 2.0 < 3.0 < 1.5 would
-	// evaluate to true, since (2.0 < 3.0) == 1.0, which is less than 1.5, even
-	// though the 3.0 < 1.5 does not hold.
-	c = parser_peek( pd );
-	if ( (c == '>' || c == '<') && (strncmp_P(&pd->str[pd->pos], PSTR("<>"), 2) != 0) ){  // only > >= < <= not <>
-		// read the operation
-		oper[0] = parser_eat( pd );
-		c = parser_peek( pd );
-		if( c == '=' )
-			oper[1] = parser_eat( pd );
-		
-		// eat trailing whitespace
-		parser_eat_whitespace( pd );
-		
-		// try to read the next term
-		int r0 = r;
-		String s0 = str_value;
-
-		r = parser_read_expr( pd,  &v1, str_value);
-			
-		// if both the arguments are numerical
-		if ((r0 == PARSER_TRUE) || (r == PARSER_TRUE))
-		{
-			// perform the boolean operations
-			if( strcmp_P( oper, PSTR("<") ) == 0 ){
-			v0 = (v0 < v1) ? -1.0 : 0.0;
-			} else if( strcmp_P( oper, PSTR(">") ) == 0 ){
-			v0 = (v0 > v1) ? -1.0 : 0.0;
-			} else if( strcmp_P( oper, PSTR("<=") ) == 0 ){
-			v0 = (v0 <= v1) ? -1.0 : 0.0;
-			} else if( strcmp_P( oper, PSTR(">=") ) == 0 ){
-			v0 = (v0 >= v1) ? -1.0 : 0.0;
-			} else {
-				parser_error( pd, PSTR("Unknown operation!" ));
-			}
-		}
-		else
-			if ((r0 == PARSER_STRING) && (r == PARSER_STRING))
-			{
-				// perform the boolean operations
-				if( strcmp_P( oper, PSTR("<") ) == 0 ){
-					v0 = (s0 < str_value) ? -1.0 : 0.0;
-				} else if( strcmp_P( oper, PSTR(">") ) == 0 ){
-					v0 = (s0 > str_value) ? -1.0 : 0.0;
-				} else if( strcmp_P( oper, PSTR("<=") ) == 0 ){
-					v0 = (s0 <= str_value) ? -1.0 : 0.0;
-				} else if( strcmp_P( oper, PSTR(">=") ) == 0 ){
-					v0 = (s0 >= str_value) ? -1.0 : 0.0;
-				} else {
-					parser_error( pd, PSTR("Unknown operation!" ));
-				}	
-				r = PARSER_TRUE;
-			}
-			else
-				parser_error( pd, PSTR("Comparaison between string and number!" ));
-				
-		// read trailing whitespace
-		parser_eat_whitespace( pd );
-	}
-	*value = v0;
-	return r;
-}
-
-int ICACHE_FLASH_ATTR parser_read_boolean_equality( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	char c, oper[] = { '\0', '\0', '\0' };
-	PARSER_PREC v0, v1;
-	int r;
-	// eat whitespace
-	parser_eat_whitespace( pd );
-	
-	// read the first value
-	r = parser_read_boolean_comparison( pd, &v0, str_value );
-	
-	// eat trailing whitespace
-	parser_eat_whitespace( pd );
-	
-	// try to perform boolean equality operator
-	c = parser_peek( pd );
-	if ( (c == '=' || c == '!' ) || (strncmp_P(&pd->str[pd->pos], PSTR("<>"), 2) == 0) ){
-		if( c == '!' ){
-			// try to match '!=' without advancing input to not clobber unary not
-			if( parser_peek_n( pd, 1 ) == '=' ){
-				oper[0] = parser_eat( pd );
-				oper[1] = parser_eat( pd );
-			} else {
-				*value = v0;
-				return r;
-			}
-		} else 
-			if( c == '<' ){
-				// try to match '<>' without advancing input to not clobber unary not
-				if( parser_peek_n( pd, 1 ) == '>' ){
-					oper[0] = parser_eat( pd );
-					oper[1] = parser_eat( pd );
-		} else {
-					*value = v0;
-					return r;
-				}
-			} else {		
-				// try to match '==' or the "basic language" '='
-			oper[0] = parser_eat( pd );
-			c = parser_peek( pd );
-			if( c != '=' )
-			{
-				//parser_error( pd, PSTR("Expected a '=' for boolean '==' operator!" ));
-				// this is a 'basic language' = operator; we trick it going back to the previous '='
-					pd->pos--;
-			}
-			oper[1] = parser_eat( pd );
-		}
-		// eat trailing whitespace
-		parser_eat_whitespace( pd );
-		
-		// try to read the next term
-		String s0 = str_value;
-		int r1 = r;
-		r = parser_read_boolean_comparison( pd, &v1, str_value );
-		if (r1 != r)
-			parser_error( pd, PSTR("Comparaison between string and number!" ));
-		// perform the boolean operations
-		if( strcmp_P( oper, PSTR("==") ) == 0 )
-		{
-			if (r == PARSER_STRING)
-			{
-				v0 = (s0 == str_value) ? -1.0 : 0.0;
-				r = PARSER_TRUE;
-			}
-			else
-				v0 = ( fabs(v0 - v1) < PARSER_BOOLEAN_EQUALITY_THRESHOLD ) ? -1.0 : 0.0;
-		} 
-		else 
-			if( (strcmp_P( oper, PSTR("!=") ) == 0 ) || (strcmp_P( oper, PSTR("<>") ) == 0 ) )
-			{
-				if (r == PARSER_STRING)
-				{
-					v0 = (s0 != str_value) ? -1.0 : 0.0;
-					r = PARSER_TRUE;
-				}
-				else
-					v0 = ( fabs(v0 - v1) > PARSER_BOOLEAN_EQUALITY_THRESHOLD ) ? -1.0 : 0.0;
-			} 
-			else 
-			{
-				parser_error( pd, PSTR("Unknown operation!" ));
-			}
-
-		// read trailing whitespace
-		parser_eat_whitespace( pd );
-	}
-	*value = v0;
-	return r;
-}
-
-
-
-int ICACHE_FLASH_ATTR parser_read_boolean_and( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	char c;
-	PARSER_PREC v0, v1;
-	int r;
-	// tries to read a boolean comparison operator ( <, >, <=, >= ) 
-	// as the first operand of the expression
-	r = parser_read_boolean_equality( pd, &v0, str_value );
-	
-	// consume any whitespace befor the operator
-	parser_eat_whitespace( pd );
-	
-	// grab the next character and check if it matches an 'and'
-	// operation. If so, match and perform and operations until
-	// there are no more to perform
-	c = parser_peek( pd );
-	while( (c == '&') || (strncmp_P(&pd->str[pd->pos], PSTR("and"), 3) == 0) ){
-		if (c == 'a') // means that we found 'and'
-		{
-			// eat the full 'and'
-			pd->pos += 3;
-		}
-		else
-		{
-		// eat the first '&'
-		parser_eat( pd );
-		// check for and eat the second '&'
-		c = parser_peek( pd );
-		if( c != '&' )
-				parser_error( pd, "Expected '&' to follow '&' in logical and operation!" );
-			// eat the 2nd '&'
-		parser_eat( pd );
-		}		
-		
-		// eat any remaining whitespace
-		parser_eat_whitespace( pd );
-
-		// read the second operand of the
-		r = parser_read_boolean_equality( pd, &v1, str_value );
-		
-//		// perform the operation, returning 1.0 for TRUE and 0.0 for FALSE
-//		v0 = ( fabs(v0) >= PARSER_BOOLEAN_EQUALITY_THRESHOLD && fabs(v1) >= PARSER_BOOLEAN_EQUALITY_THRESHOLD ) ? 1.0 : 0.0;
-		
-		// define a more "global" way to work; a binary 'and' is done between the 2 operators
-		// this will permit to cover the comparaison and also the binary 'and' operator
-		v0 = ((int) v0) & ((int) v1);
-	
-		// eat any following whitespace
-		parser_eat_whitespace( pd );
-		
-		// grab the next character to continue trying to perform 'and' operations
-		c = parser_peek( pd );
-	}
-	*value = v0;
-	return r;
-}
-
-int ICACHE_FLASH_ATTR parser_read_boolean_or( parser_data *pd, PARSER_PREC *value, String &str_value ){
-	char c;
-	PARSER_PREC v0, v1;
-	int r;
-	// read the first term
-	r = parser_read_boolean_and( pd, &v0, str_value );
-	
-	// eat whitespace
-	parser_eat_whitespace( pd );
-
-	// grab the next character and check if it matches an 'or' or 'xor'
-	// operation. If so, match and perform and operations until
-	// there are no more to perform
-	c = parser_peek( pd );
-
-	while( (c == '|') || (strncmp_P(&pd->str[pd->pos], PSTR("or"), 2) == 0) ||
-						 (strncmp_P(&pd->str[pd->pos], PSTR("xor"), 3) == 0) )
-	{
-		if (c == 'o') // means that we found 'or'
-		{
-			// eat the full 'or'
-			pd->pos += 2;
-		}
-		else
-			if (c == 'x') // means that we found 'xor'
-			{
-				// eat the full 'xor'
-				pd->pos += 3;
-			}		
-			else
-			{
-				// match the first '|' character
-				parser_eat( pd );
-				
-				// check for and match the second '|' character
-				c = parser_peek( pd );
-				if( c != '|' )
-					parser_error( pd, PSTR("Expected '|' to follow '|' in logical or operation!" ));
-				parser_eat( pd );
-			}
-		
-		// eat any following whitespace
-		parser_eat_whitespace( pd );
-		
-		// read the second operand
-		r = parser_read_boolean_and( pd, &v1, str_value );
-	
-//		// perform the 'or' operation
-//		v0 = ( fabs(v0) >= PARSER_BOOLEAN_EQUALITY_THRESHOLD || fabs(v1) >= PARSER_BOOLEAN_EQUALITY_THRESHOLD ) ? 1.0 : 0.0;
-		
-		// define a more "global" way to work; a binary 'or' is done between the 2 operators
-		// this will permit to cover the comparaison and also the binary 'or' operator
-		if (c != 'x')
-			v0 = ((int) v0) | ((int) v1);	//or
-		else
-			v0 = ((int) v0) ^ ((int) v1);	//xor
-		
-		// eat any following whitespace
-		parser_eat_whitespace( pd );
-		
-		// grab the next character to continue trying to match
-		// 'or' operations
-		c = parser_peek( pd );
-	}
-	
-	// return the resulting value
-	*value = v0;
-	return r;
-}
-
-String FloatToString(float d)
-{
-  //Convert a float to string with 5 decimals and then removes the trailing zeros (and eventually the '.')
-  String z = String(d, 5);
-  char *p;
-  p = (char*) z.c_str()+ z.length() -1;
-  while (*p == '0')
-  {
-    *p-- = '\0';
-  }
-  if (*p == '.')
-    *p = '\0';
-  return String(z.c_str());
-} 
diff --git a/libraries/Expression_Parser/expression_parser_string.h b/libraries/Expression_Parser/expression_parser_string.h
deleted file mode 100644
index 1039063..0000000
--- a/libraries/Expression_Parser/expression_parser_string.h
+++ /dev/null
@@ -1,367 +0,0 @@
-#ifndef EXPRESSION_PARSER_H
-#define EXPRESSION_PARSER_H
-
-/**
- @mainpage
- @author James Gregson james.gregson@gmail.com <br>&nbsp;<br>
- @brief A simple C expression parser.  Hand-rolled recursive descent style algorithm implements the parser, removing the need for external tools such as lex/yacc. Reads mathematical expression in infix notation (with a few built-in mathematical functions) and produces double-precision results.  
- 
- The library handles:
- 
- - standard arithmetic operations (+,-,*,/) with operator precedence
- - exponentiation ^ and nested exponentiation
- - unary + and -
- - expressions enclosed in parentheses ('(',')'), optionally nested
- - built-in math functions: pow(x,y), sqrt(x), log(x), exp(x), sin(x), asin(x),
- cos(x), acos(x), tan(x), atan(x), atan2(y,x), abs(x), fabs(x), floor(x),
- ceil(x), round(x), with input arguments checked for domain validity, e.g.
- 'sqrt( -1.0 )' returns an error.
- - standard boolean operations (==,!=,>,<,>=,<=,&&,||,!) using the convention
- that False := fabs(value) <= PARSER_BOOLEAN_EQUALITY_THRESHOLD and
- True = !False := fabs(value) > PARSER_BOOLEAN_EQUALITY_THRESHOLD
- - predefined named variables and functions via a callback interface (see below)
- 
- Operator precedence and syntax matches the C language as closely as possible to allow straightforward validation of code-correctness.  I.e. the parser should produce the same result as the C language to within rounding errors when only operations from C are used.
- 
- Boolean operations may be excluded by defining the preprocessor symbol PARSER_EXCLUDE_BOOLEAN_OPS.
- 
- The library is also thread safe, allowing multiple parsers to be operated (on  different inputs) simultaneously.
- 
- Error handling is achieved using the setjmp() and longjmp() commands. To the best of my knowledge these are available on nearly all platforms, including embedded, platforms so the library should run happily even on AVRs (this has not been tested).
- 
- License: GPLv2 for non-commercial use. Contact me for commercial licensing. This code is provided as-is, with no warranty whatsoever.
- 
- Predefined variables and functions are accommodated with a callback interface that allows driver code to look up named variables and evaluate functions as required by the parser.  These callbacks must match the call-signature for the parser_variable_callback and parser_function_callback types below.  The variable callback takes the name of the variable to be looked up and returns true if the named variable value was copied into the output argument, returning false otherwise.  The function callback operates similarly, taking the name of the function to evaluate as well as a list of arguments to that function and (if successful) placing the evaluated function value in the return argument and returning true.  Function calls may be arbitrarily nested.
-
- @Author CiccioCB
- @Date March 2016
- @Modifications implemented :
-	- Introduction of the % (modulo) operator; the arguments are converted to integer
-	- Introduction of String arguments literals (string between double quotes), variables and functions
-	- Introduction of the Operator '+' for the strings (sum of 2 strings)
-	- Introduction of the '==' (equal) and '!=' (not equal) comparators for strings
-	- Introduction of the '>>' (shift right) and '<<' operator; the arguemtns are converted to integer
-	- Introduction of the "basic syntax" comparaison operators "<>", "="
-	- Introduction of PARSER_PREC definition that can be float or double; determine the math precision of the parser
-	- Introduction of the full comparaisons between strings ; now the 'C' and 'Basic' syntax co-exists
-	- Introduction of the "Basic syntax" boolean operators (and, or, not); ; now the 'C' and 'Basic' syntax co-exists
-	- Introduction of the binary operators "and" and "or" ; ex a = 255 and 16 (or a = 240 or 15)
-	- Introduction of the | string literal; you can use now " or | permitting to include | or " into strings
-	- Introduction of the xor binary operator
-	TBD : more control on the kind (string or number) for the arguments
-		: more operators on strings
- */
-
-#include<setjmp.h>
-#include<stdlib.h>
-
-#include <String>
-using namespace std;
-
-/**
- @brief define a threshold for defining true and false for boolean expressions on doubles
-*/
-#if !defined(PARSER_BOOLEAN_EQUALITY_THRESHOLD)
-#define PARSER_BOOLEAN_EQUALITY_THRESHOLD	(1e-10)
-#endif
-
-/**
- @brief maximum length for tokens in characters for expressions, define this in the compiler options to change the maximum size
-*/
-#if !defined(PARSER_MAX_TOKEN_SIZE)
-#define PARSER_MAX_TOKEN_SIZE 256
-#endif
-
-/**
- @brief maximum number of arguments to user-defined functions, define this in the compiler opetions to change.
-*/
-#if !defined(PARSER_MAX_ARGUMENT_COUNT)
-#define PARSER_MAX_ARGUMENT_COUNT 4
-#endif
-
-/**
- @brief definitions for parser true and false or String
-*/
-#define PARSER_FALSE 	0
-#define PARSER_TRUE  	1
-#define PARSER_STRING	2
-
-/**
- @brief definitions for math precision (double or float)
-*/
-#if !defined(PARSER_PREC)
-#define PARSER_PREC	float
-#endif
-
-/**
- @brief user-defined variable callback function. see expression_parser.h for more details.
- @param[in] user_data pointer to any user-defined state data that is required, none in this case
- @param[in] name name of the variable to look up the value of
- @param[out] value output point to double that holds the variable value on completion
- @param[out] value output point to string that holds the variable value on completion
- @return PARSER_TRUE if the variable exists and value was set by the callback with the double-prevision result stored in value or
- PARSER_STRING if the variable exists and value was set by the callback with the string result stored in value_str or
- PARSER_FALSE otherwise.
-*/ 
-typedef int (*parser_variable_callback)( void *user_data, const char *name, PARSER_PREC *value, String *value_str  );
-
-/**
- @brief user-defined function callback. see expression_parser.h for more details.
- @param[in] user_data input pointer to any user-defined state variables needed.  in this case, this pointer is the maximum number of arguments allowed to the functions (as a contrived example usage).
- @param[in] name name of the function to evaluate
- @param[in] num_args number of arguments that were parsed in the function call
- @param[in] args list of parsed arguments (double precision numbers) - if the arg is not valid, the value is nan 
- @param[out] value output evaluated result of the function call (double precision number)
- @param[in] args list of parsed arguments (strings) - if the arg is not valid, the value is '\0'
- @param[out] value output evaluated result of the function call (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-         PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
-*/
-typedef int (*parser_function_callback)( void *user_data, const char *name, const int num_args, const PARSER_PREC *args, PARSER_PREC *value, String **args_str, String *value_str  );
-
-/**
- @brief main data structure for the parser, holds a pointer to the input String and the index of the current position of the parser in the input
-*/
-typedef struct { 
-	
-	/** @brief input String to be parsed */
-	const char *str; 
-	
-	/** @brief length of input String */
-	int        len;
-	
-	/** @brief current parser position in the input */
-	int        pos;
-	
-	/** @brief position to return to for exception handling */
-	jmp_buf		err_jmp_buf;
-	
-	/** @brief error String to display, or query on failure */
-	const char *error;
-	
-	/** @brief data pointer that is passed to the variable and function callback. Can be used to stored application state data necessary for performing variable and function lookup. Set to NULL if not used */
-	void						*user_data;
-	
-	/** @brief callback function used to lookup variable values, set to NULL if not used */
-	parser_variable_callback	variable_cb;
-	
-	/** @brief callback function used to perform user-function evaluations, set to NULL if not used */
-	parser_function_callback	function_cb;
-} parser_data;
-
-/**
- @brief convenience function for using the library, handles initialization and destruction. basically just wraps parser_parse().
- @param[in] expr expression to parse
- @param[out] value output evaluated result of the expression call (double precision number)
- @param[out] value output evaluated result of the expression call (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise
- */
-int parse_expression( const char *expr, PARSER_PREC *value, String *str_value );
-
-/**
- @brief convenience function for using the library that exposes the callback interface to the variable and function features.  Initializes a parser_data structure on the stack (i.e. no malloc() or free()), sets the appropriate fields and then calls the internal library functions.
- @param[in] expr expression to parse
- @param[in] variable_cb the user-defined variables callback function. set to NULL if unused. see the parser_data structure and the header documentation for this file for more information.
- @param[in] function_cb the user-defined functions callback function. set to NULL if unused. see the parser_data structure and the header documentation of this file for more information.
- @param[in] user_data void pointer that is passed unaltered to the variable_cb and function_cb pointers, for storing application state needed to look up variables and to evaluate functions. set to NULL if unused
- @param[out] value output evaluated result of the expression call (double precision number)
- @param[out] value output evaluated result of the expression call (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
-*/
-int parse_expression_with_callbacks( const char *expr, parser_variable_callback variable_cb, parser_function_callback function_cb, void *user_data, PARSER_PREC *value, String &str_value );
-
-/**
- @brief primary public routine for the library
- @param[in] expr expression to parse
- @param[out] value expression parsed (double precision number)
- @param[out] value value expression parsed (string)
- @return PARSER_TRUE if the expression has a double-precision result or
-         PARSER_STRING if the expression has a string result stored or
-		 PARSER_FALSE otherwise.
- */
-int parser_parse( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief initializes a pre-existing parser_data struture. Use this function to avoid any dynamic memory allocation by the code by passing a pointer to a parser_data structure that has been initialized on the stack.
- @param[inout] pd input and output parser data structure to initialize
- @param[in] str input String to parse
- @param[in] variable_cb variable callback function pointer, set to NULL if not used
- @param[in] function_cb function callback function pointer, set to NULL if not used
- @param[in] user_data pointer to arbitrary user-specified data needed by either the variable or function callback. The same pointer is passed to both functions.  Set to NULL if not needed.
- @return true if initialization was successful, false otherwise
- */
-int parser_data_init( parser_data *pd, const char *str, parser_variable_callback variable_cb, parser_function_callback function_cb, void *user_data );
-
-/**
- @brief frees a previously allocated parser_data structure
- @param[in] pd input parser_data structure to free
- */
-void parser_data_free( parser_data *pd );
-
-/**
- @brief error function for the parser, simply bails on the code
- @param[in] error String to print
- */
-void parser_error( parser_data *pd, const char *err );
-
-/**
- @brief looks at a input character, potentially offset from the current character, without consuming any
- @param[in] pd input parser_data structure to operate on
- @param[in] offset optional offset for character, relative to current character
- @return character that is offset characters from the current input
- */
-char parser_peek( parser_data *pd );
-	
-/**
- @brief returns the current character, and advances the input position
- @param[in] pd input parser_data structure to operate on
- @return current character
- */
-char parser_eat( parser_data *pd );
-	
-/**
- @brief voraciously consumes whitespace input until a non-whitespace character is reached
- @param[in] pd input parser_data structure to operate on
- */
-void parser_eat_whitespace( parser_data *pd );
-
-/**  NEW FUNCTION BY CICCIOCB 
- @brief reads and converts a double precision floating point value in one of the many forms,
- e.g. +1.0, -1.0, -1, +1, -1., 1., 0.5, .5, .5e10, .5e-2 .
- It's able now to read and convert also string arguments. A string can be a function,
- a variable or a literal (text between "double quotes").
- @param[in] pd input parser_data structure to operate on
- @param[out] value output evaluated result of the expression call (double precision number)
- @param[out] value output evaluated result of the expression call (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
- */
-int parser_read_Value( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief reads arguments for the builtin functions, auxilliary function for parser_read_builtin()
- @param[in] pd input parser_data structure to operate upon
- @param[out] value output value of the argument that was read (double precision number)
- @param[out] value output value of the argument that was read (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
- */
-int parser_read_argument( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-int parser_read_argument_list( parser_data *pd, int *num_args, PARSER_PREC *args, String **args_str);
-
-/**
- @brief reads and calls built-in functions, like sqrt(.), pow(.), etc.
- @param[in] pd input parser_data structure to operate upon
- @param[out] value output value of the resulting value (double precision number)
- @param[out] value output value of the resulting value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
-*/
-int parser_read_builtin( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief attempts to read an expression in parentheses, or failing that a literal value
- @param[in] pd input parser_data structure to operate upon
- @param[out] expression/literal value (double precision number)
- @param[out] expression/literal value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
- */
-int parser_read_paren( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief attempts to read a unary operation, or failing that, a parenthetical or literal value
- @param[in] pd input parser_data structure to operate upon
- @param[out] expression/literal value (double precision number)
- @param[out] expression/literal value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
-*/
-int parser_read_unary( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief attempts to read an exponentiation operator, or failing that, a parenthetical expression 
- @param[in] pd input parser_data structure to operate upon
- @param[out] exponentiation value (double precision number)
- @param[out] exponentiation value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
- */
-int parser_read_power( parser_data *pd, PARSER_PREC *value, String &str_value );
-	
-/**
- @brief reads a term in an expression
- @param[in] pd input parser_data structure to operate on
- @param[out] return value of the term (double precision number)
- @param[out] return value of the term (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
- */
-int parser_read_term( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief attempts to read an expression
- @param[in] pd input parser_data structure
- @param[out] return expression value (double precision number)
- @param[out] return expression value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
- */
-int parser_read_expr( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief reads and performs a boolean comparison operations (<,>,<=,>=,==) if found
- @param[in] pd input parser_data structure
- @param[out] return sub-expression value (double precision number)
- @param[out] return sub-expression value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
- */
-int parser_read_boolean_comparison( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-/**
- @brief reads and performs a boolean 'and' operation (if found)
- @param[in] pd input parser_data structure
- @param[out] return sub-expression value (double precision number)
- @param[out] return sub-expression value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
-*/
-int parser_read_boolean_and( parser_data *pd, PARSER_PREC *value, String &str_value );
-	
-/**
- @brief reads and performs a boolean or operation (if found)
- @param[in] pd input parser_data structure
- @param[out] return expression value (double precision number)
- @param[out] return expression value (string)
- @return PARSER_TRUE if the function exists and was evaluated successfully with the double-prevision result stored in value or
-		 PARSER_STRING if the function exists and was evaluated successfully with the string result stored in value_str or
-		 PARSER_FALSE otherwise.
-*/
-int parser_read_boolean_or( parser_data *pd, PARSER_PREC *value, String &str_value );
-
-
-/**
- @brief Convert a float to string with 5 decimals and then removes the trailing zeros (and eventually the '.')
- @param[in] value to be converted (double precision number)
- @param[out] return expression value (string)
- @return converted value (string)
-*/
-String FloatToString(PARSER_PREC d);
-#endif
diff --git a/libraries/IRremoteESP8266/IRremoteESP8266.cpp b/libraries/IRremoteESP8266/IRremoteESP8266.cpp
index 105ef63..edfba48 100644
--- a/libraries/IRremoteESP8266/IRremoteESP8266.cpp
+++ b/libraries/IRremoteESP8266/IRremoteESP8266.cpp
@@ -18,6 +18,7 @@
  * JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post)
  * LG added by Darryl Smith (based on the JVC protocol)
  * Whynter A/C ARC-110WD added by Francesco Meschia
+ * Global Cache IR format sender added by Hisham Khalifa (http://www.hishamkhalifa.com)
  *
  * Updated by markszabo (https://github.com/markszabo/IRremoteESP8266) for sending IR code on ESP8266
  * Updated by Sebastien Warin (http://sebastien.warin.fr) for receiving IR code on ESP8266
@@ -108,6 +109,24 @@ void IRsend::sendNEC(unsigned long data, int nbits)
   space(0);
 }
 
+void IRsend::sendLG (unsigned long data, int nbits)
+{
+	enableIROut(38);
+	mark(LG_HDR_MARK);
+	space(LG_HDR_SPACE);
+	mark(LG_BIT_MARK);
+	for (unsigned long mask = 1UL << (nbits - 1); mask; mask >>= 1) {
+		if (data & mask) {
+			space(LG_ONE_SPACE);
+			mark(LG_BIT_MARK);
+		} else {
+			space(LG_ZERO_SPACE);
+			mark(LG_BIT_MARK);
+		}
+	}
+	space(0);
+}
+
 void IRsend::sendWhynter(unsigned long data, int nbits) {
 	enableIROut(38);
 	mark(WHYNTER_ZERO_MARK);
@@ -161,6 +180,31 @@ void IRsend::sendRaw(unsigned int buf[], int len, int hz)
   space(0); // Just to be sure
 }
 
+// Global Cache format w/o emitter ID or request ID. Starts from hertz, 
+// followed by number of times to emit (count),
+// followed by offset for repeats, followed by code as units of periodic time.
+void IRsend::sendGC(unsigned int buf[], int len)
+{
+  int khz = buf[0]/1000; // GC data starts with frequency in Hz.
+  enableIROut(khz); 
+  int periodic_time = 1000/khz;
+  int count = buf[1]; // Max 50 as per GC.
+
+  for (int i = 0; i < count; i++) {
+    int j = i > 0 ? buf[2] + 2 : 3; // Account for offset if we're repeating, otherwise start at index 3.
+    for (; j < len; j++) {
+      int microseconds = buf[j] * periodic_time; // Convert periodic units to microseconds. Minimum is 80 for actual GC units.
+      if (j & 1) {
+        mark(microseconds); // Our codes start at an odd index (not even as with sendRaw).
+      }
+      else {
+        space(microseconds);
+      }
+    }
+  }
+  space(0);
+}
+
 // Note: first bit must be a one (start bit)
 void IRsend::sendRC5(unsigned long data, int nbits)
 {
@@ -410,7 +454,8 @@ static void ICACHE_FLASH_ATTR gpio_intr(void *arg) {
     static uint32_t start = 0;
     uint32_t now = system_get_time();
 	if (irparams.rcvstate == STATE_IDLE) {
-		irparams.rcvstate = STATE_MARK;	
+		irparams.rcvstate = STATE_MARK;
+		irparams.rawbuf[irparams.rawlen++] = 20;		
 	}
     else if (irparams.rawlen < RAWBUF) {
 		irparams.rawbuf[irparams.rawlen++] = (now - start) / USECPERTICK + 1;
@@ -981,10 +1026,10 @@ long IRrecv::decodeRC6(decode_results *results) {
 long IRrecv::decodePanasonic(decode_results *results) {
     unsigned long long data = 0;
 	int offset = 1;  // Dont skip first space    
-    /*if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) {
+    if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_MARK)) {
         return ERR;
     }
-    offset++;*/		
+    offset++;		
     if (!MATCH_MARK(results->rawbuf[offset], PANASONIC_HDR_SPACE)) {
         return ERR;
     }
@@ -1109,7 +1154,7 @@ long IRrecv::decodeJVC(decode_results *results) {
 // SAMSUNGs have a repeat only 4 items long
 long IRrecv::decodeSAMSUNG(decode_results *results) {
   long data = 0;
-  int offset = 0;  // Dont skip first space
+  int offset = 1;  // Dont skip first space
   // Initial mark
   if (!MATCH_MARK(results->rawbuf[offset], SAMSUNG_HDR_MARK)) {
     return ERR;
diff --git a/libraries/IRremoteESP8266/IRremoteESP8266.h b/libraries/IRremoteESP8266/IRremoteESP8266.h
index 3868c07..85e57f1 100644
--- a/libraries/IRremoteESP8266/IRremoteESP8266.h
+++ b/libraries/IRremoteESP8266/IRremoteESP8266.h
@@ -125,11 +125,13 @@ class IRsend
   void begin();
   void sendWhynter(unsigned long data, int nbits);
   void sendNEC(unsigned long data, int nbits);
+  void sendLG(unsigned long data, int nbits);
   void sendSony(unsigned long data, int nbits);
   // Neither Sanyo nor Mitsubishi send is implemented yet
   //  void sendSanyo(unsigned long data, int nbits);
   //  void sendMitsubishi(unsigned long data, int nbits);
   void sendRaw(unsigned int buf[], int len, int hz);
+  void sendGC(unsigned int buf[], int len);
   void sendRC5(unsigned long data, int nbits);
   void sendRC6(unsigned long data, int nbits);
   void sendDISH(unsigned long data, int nbits);
diff --git a/libraries/IRremoteESP8266/examples/IRGCSendDemo/IRGCSendDemo.ino b/libraries/IRremoteESP8266/examples/IRGCSendDemo/IRGCSendDemo.ino
new file mode 100644
index 0000000..e053441
--- /dev/null
+++ b/libraries/IRremoteESP8266/examples/IRGCSendDemo/IRGCSendDemo.ino
@@ -0,0 +1,26 @@
+/*
+ * IRremoteESP8266: IRsendGCDemo - demonstrates sending Global Cache-formatted IR codes with IRsend
+ * An IR LED must be connected to ESP8266 pin 0.
+ * Version 0.1 30 March, 2016
+ * Based on Ken Shirriff's IrsendDemo Version 0.1 July, 2009, Copyright 2009 Ken Shirriff, http://arcfn.com
+ */
+
+#include <IRremoteESP8266.h>
+
+// Codes are in Global Cache format less the emitter ID and request ID. These codes can be found in GC's Control Tower database.
+
+unsigned int Samsung_power_toggle[71] = {38000,1,1,170,170,20,63,20,63,20,63,20,20,20,20,20,20,20,20,20,20,20,63,20,63,20,63,20,20,20,20,20,20,20,20,20,20,20,20,20,63,20,20,20,20,20,20,20,20,20,20,20,20,20,63,20,20,20,63,20,63,20,63,20,63,20,63,20,63,20,1798};
+
+IRsend irsend(4); //an IR emitter led is connected to GPIO pin 4
+
+void setup()
+{
+  irsend.begin();
+  Serial.begin(115200);
+}
+
+void loop() {
+  Serial.println("Toggling power");
+  irsend.sendGC(Samsung_power_toggle, 71);
+  delay(10000);
+}
\ No newline at end of file
diff --git a/libraries/IRremoteESP8266/examples/IRGCTCPServer/IRGCTCPServer.ino b/libraries/IRremoteESP8266/examples/IRGCTCPServer/IRGCTCPServer.ino
new file mode 100644
index 0000000..b5ea422
--- /dev/null
+++ b/libraries/IRremoteESP8266/examples/IRGCTCPServer/IRGCTCPServer.ino
@@ -0,0 +1,85 @@
+/*
+ * IRremoteESP8266: IRGCTCPServer - send Global Cache-formatted codes via TCP.
+ * An IR emitter must be connected to GPIO pin 4.
+ * Version 0.1 1 April, 2016
+ * Hisham Khalifa, http://www.hishamkhalifa.com
+ *
+ * Example command - Samsung TV power toggle: 38000,1,1,170,170,20,63,20,63,20,63,20,20,20,20,20,20,20,20,20,20,20,63,20,63,20,63,20,20,20,20,20,20,20,20,20,20,20,20,20,63,20,20,20,20,20,20,20,20,20,20,20,20,20,63,20,20,20,63,20,63,20,63,20,63,20,63,20,63,20,1798\r\n
+ */
+ 
+#include <IRremoteESP8266.h>
+#include <IRremoteInt.h>
+
+#include <ESP8266WiFi.h>
+#include <WiFiClient.h>
+#include <WiFiServer.h>
+
+const char* ssid = "...";
+const char* password = "...";
+
+WiFiServer server(4998); // Uses port 4998.
+WiFiClient client;
+
+unsigned int *codeArray;
+IRsend irsend(4); //an IR emitter led is connected to GPIO pin 4
+
+void parseString(String str) {
+  int nextIndex;
+  int codeLength = 1;
+  int currentIndex = 0;
+  nextIndex = str.indexOf(',');
+
+  // change to do/until and remove superfluous repetition below...
+  while (nextIndex != -1) {
+    if (codeLength > 1) {
+        codeArray = (unsigned int*) realloc(codeArray, codeLength * sizeof(unsigned int));
+    } else {
+        codeArray = (unsigned int*) malloc(codeLength * sizeof(unsigned int));
+    }
+
+    codeArray[codeLength-1] = (unsigned int) (str.substring(currentIndex, nextIndex).toInt());
+  
+    codeLength++;
+    currentIndex = nextIndex + 1;
+    nextIndex = str.indexOf(',', currentIndex);       
+  }
+  codeArray = (unsigned int*) realloc(codeArray, codeLength * sizeof(unsigned int));
+  codeArray[codeLength-1] = (unsigned int) (str.substring(currentIndex, nextIndex).toInt());
+  
+  irsend.sendGC(codeArray,codeLength);
+}
+
+void setup() {
+  // initialize serial:
+  Serial.begin(115200);
+  Serial.println(" ");
+  Serial.println("IR TCP Server");
+  
+ while (WiFi.status() != WL_CONNECTED) {
+    delay(900);
+    Serial.print(".");
+  }
+
+    server.begin();
+    IPAddress myAddress = WiFi.localIP();
+    Serial.println(myAddress);
+    irsend.begin();
+}
+
+void loop() {
+  while(!client) {
+    client = server.available();
+  }
+
+  while(!client.connected()){
+    delay(900);
+    client = server.available();
+  }
+  
+  if(client.available()){
+    String irCode = client.readStringUntil('\r'); // Exclusive of \r
+    client.readStringUntil('\n'); // Skip new line as well
+    client.flush();
+    parseString(irCode);
+  }  
+}
\ No newline at end of file
diff --git a/libraries/IRremoteESP8266/examples/IRServer/IRServer.ino b/libraries/IRremoteESP8266/examples/IRServer/IRServer.ino
index b51ad2c..94cf929 100644
--- a/libraries/IRremoteESP8266/examples/IRServer/IRServer.ino
+++ b/libraries/IRremoteESP8266/examples/IRServer/IRServer.ino
@@ -27,7 +27,7 @@ void handleIr(){
     if(server.argName(i) == "code") 
     {
       unsigned long code = server.arg(i).toInt();
-      irsend.sendNEC(code, 36);
+      irsend.sendNEC(code, 32);
     }
   }
   handleRoot();
diff --git a/libraries/MAX31850_DallasTemp/DallasTemperature.cpp b/libraries/MAX31850_DallasTemp/DallasTemperature.cpp
new file mode 100644
index 0000000..f1a6d3c
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/DallasTemperature.cpp
@@ -0,0 +1,751 @@
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// Version 3.7.2 modified on Dec 6, 2011 to support Arduino 1.0
+// See Includes...
+// Modified by Jordan Hochenbaum
+
+#include "DallasTemperature.h"
+
+#if ARDUINO >= 100
+    #include "Arduino.h"   
+#else
+extern "C" {
+    #include "WConstants.h"
+}
+#endif
+
+DallasTemperature::DallasTemperature(OneWire* _oneWire)
+  #if REQUIRESALARMS
+  : _AlarmHandler(&defaultAlarmHandler)
+  #endif
+{
+  _wire = _oneWire;
+  devices = 0;
+  parasite = false;
+  bitResolution = 9;
+  waitForConversion = true;
+  checkForConversion = true;
+}
+
+// initialise the bus
+void DallasTemperature::begin(void)
+{
+  DeviceAddress deviceAddress;
+
+  _wire->reset_search();
+  devices = 0; // Reset the number of devices when we enumerate wire devices
+
+  while (_wire->search(deviceAddress))
+  {
+    if (validAddress(deviceAddress))
+    {
+      if (!parasite && readPowerSupply(deviceAddress)) parasite = true;
+
+      ScratchPad scratchPad;
+
+      readScratchPad(deviceAddress, scratchPad);
+
+	  bitResolution = max(bitResolution, getResolution(deviceAddress));
+
+      devices++;
+    }
+  }
+}
+
+// returns the number of devices found on the bus
+uint8_t DallasTemperature::getDeviceCount(void)
+{
+  return devices;
+}
+
+// returns true if address is valid
+bool DallasTemperature::validAddress(uint8_t* deviceAddress)
+{
+  return (_wire->crc8(deviceAddress, 7) == deviceAddress[7]);
+}
+
+// finds an address at a given index on the bus
+// returns true if the device was found
+bool DallasTemperature::getAddress(uint8_t* deviceAddress, uint8_t index)
+{
+  uint8_t depth = 0;
+
+  _wire->reset_search();
+
+  while (depth <= index && _wire->search(deviceAddress))
+  {
+    if (depth == index && validAddress(deviceAddress)) return true;
+    depth++;
+  }
+
+  return false;
+}
+
+// attempt to determine if the device at the given address is connected to the bus
+bool DallasTemperature::isConnected(uint8_t* deviceAddress)
+{
+  ScratchPad scratchPad;
+  return isConnected(deviceAddress, scratchPad);
+}
+
+// attempt to determine if the device at the given address is connected to the bus
+// also allows for updating the read scratchpad
+bool DallasTemperature::isConnected(uint8_t* deviceAddress, uint8_t* scratchPad)
+{
+  readScratchPad(deviceAddress, scratchPad);
+  return (_wire->crc8(scratchPad, 8) == scratchPad[SCRATCHPAD_CRC]);
+}
+
+// read device's scratch pad
+void DallasTemperature::readScratchPad(uint8_t* deviceAddress, uint8_t* scratchPad)
+{
+  // send the command
+  _wire->reset();
+  _wire->select(deviceAddress);
+  _wire->write(READSCRATCH);
+
+  // TODO => collect all comments &  use simple loop
+  // byte 0: temperature LSB  
+  // byte 1: temperature MSB
+  // byte 2: high alarm temp
+  // byte 3: low alarm temp
+  // byte 4: DS18S20: store for crc
+  //         DS18B20 & DS1822: configuration register
+  // byte 5: internal use & crc
+  // byte 6: DS18S20: COUNT_REMAIN
+  //         DS18B20 & DS1822: store for crc
+  // byte 7: DS18S20: COUNT_PER_C
+  //         DS18B20 & DS1822: store for crc
+  // byte 8: SCRATCHPAD_CRC
+  //
+  // for(int i=0; i<9; i++)
+  // {
+  //   scratchPad[i] = _wire->read();
+  // }
+
+  
+  // read the response
+
+  // byte 0: temperature LSB
+  scratchPad[TEMP_LSB] = _wire->read();
+
+  // byte 1: temperature MSB
+  scratchPad[TEMP_MSB] = _wire->read();
+
+  // byte 2: high alarm temp
+  scratchPad[HIGH_ALARM_TEMP] = _wire->read();
+
+  // byte 3: low alarm temp
+  scratchPad[LOW_ALARM_TEMP] = _wire->read();
+
+  // byte 4:
+  // DS18S20: store for crc
+  // DS18B20 & DS1822: configuration register
+  scratchPad[CONFIGURATION] = _wire->read();
+
+  // byte 5:
+  // internal use & crc
+  scratchPad[INTERNAL_BYTE] = _wire->read();
+
+  // byte 6:
+  // DS18S20: COUNT_REMAIN
+  // DS18B20 & DS1822: store for crc
+  scratchPad[COUNT_REMAIN] = _wire->read();
+
+  // byte 7:
+  // DS18S20: COUNT_PER_C
+  // DS18B20 & DS1822: store for crc
+  scratchPad[COUNT_PER_C] = _wire->read();
+
+  // byte 8:
+  // SCTRACHPAD_CRC
+  scratchPad[SCRATCHPAD_CRC] = _wire->read();
+
+  for (uint8_t i=0; i<8; i++) {
+    //Serial.print("\n 0x"); Serial.print(scratchPad[i], HEX);
+  }
+  _wire->reset();
+}
+
+// writes device's scratch pad
+void DallasTemperature::writeScratchPad(uint8_t* deviceAddress, const uint8_t* scratchPad)
+{
+  _wire->reset();
+  _wire->select(deviceAddress);
+  _wire->write(WRITESCRATCH);
+  _wire->write(scratchPad[HIGH_ALARM_TEMP]); // high alarm temp
+  _wire->write(scratchPad[LOW_ALARM_TEMP]); // low alarm temp
+  // DS18S20 does not use the configuration register
+  if (deviceAddress[0] != DS18S20MODEL) _wire->write(scratchPad[CONFIGURATION]); // configuration
+  _wire->reset();
+  // save the newly written values to eeprom
+  _wire->write(COPYSCRATCH, parasite);
+  if (parasite) delay(10); // 10ms delay
+  _wire->reset();
+}
+
+// reads the device's power requirements
+bool DallasTemperature::readPowerSupply(uint8_t* deviceAddress)
+{
+  bool ret = false;
+  _wire->reset();
+  _wire->select(deviceAddress);
+  _wire->write(READPOWERSUPPLY);
+  if (_wire->read_bit() == 0) ret = true;
+  _wire->reset();
+  return ret;
+}
+
+
+// set resolution of all devices to 9, 10, 11, or 12 bits
+// if new resolution is out of range, it is constrained.
+void DallasTemperature::setResolution(uint8_t newResolution)
+{
+  bitResolution = constrain(newResolution, 9, 12);
+  DeviceAddress deviceAddress;
+  for (int i=0; i<devices; i++)
+  {
+    getAddress(deviceAddress, i);
+	setResolution(deviceAddress, bitResolution);
+  }
+}
+
+// set resolution of a device to 9, 10, 11, or 12 bits
+// if new resolution is out of range, 9 bits is used. 
+bool DallasTemperature::setResolution(uint8_t* deviceAddress, uint8_t newResolution)
+{
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad))
+  {
+    // DS18S20 has a fixed 9-bit resolution
+    if (deviceAddress[0] != DS18S20MODEL)
+    {
+      switch (newResolution)
+      {
+        case 12:
+          scratchPad[CONFIGURATION] = TEMP_12_BIT;
+          break;
+        case 11:
+          scratchPad[CONFIGURATION] = TEMP_11_BIT;
+          break;
+        case 10:
+          scratchPad[CONFIGURATION] = TEMP_10_BIT;
+          break;
+        case 9:
+        default:
+          scratchPad[CONFIGURATION] = TEMP_9_BIT;
+          break;
+      }
+      writeScratchPad(deviceAddress, scratchPad);
+    }
+	return true;  // new value set
+  }
+  return false;
+}
+
+// returns the global resolution
+uint8_t DallasTemperature::getResolution()
+{
+	return bitResolution;
+}
+
+// returns the current resolution of the device, 9-12
+// returns 0 if device not found
+uint8_t DallasTemperature::getResolution(uint8_t* deviceAddress)
+{
+  if (deviceAddress[0] == DS18S20MODEL) return 9; // this model has a fixed resolution
+
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad))
+  {
+    switch (scratchPad[CONFIGURATION])
+    {
+      case TEMP_12_BIT:
+        return 12;
+        
+      case TEMP_11_BIT:
+        return 11;
+        
+      case TEMP_10_BIT:
+        return 10;
+        
+      case TEMP_9_BIT:
+        return 9;
+        
+     }
+    // special exception for MAX31850
+    if ((scratchPad[CONFIGURATION] & 0xF0) == 0xF0) 
+      return 12;
+  }
+  return 0;
+}
+
+
+// sets the value of the waitForConversion flag
+// TRUE : function requestTemperature() etc returns when conversion is ready
+// FALSE: function requestTemperature() etc returns immediately (USE WITH CARE!!)
+// 		  (1) programmer has to check if the needed delay has passed 
+//        (2) but the application can do meaningful things in that time
+void DallasTemperature::setWaitForConversion(bool flag)
+{
+	waitForConversion = flag;
+}
+
+// gets the value of the waitForConversion flag
+bool DallasTemperature::getWaitForConversion()
+{
+	return waitForConversion;
+}
+
+
+// sets the value of the checkForConversion flag
+// TRUE : function requestTemperature() etc will 'listen' to an IC to determine whether a conversion is complete
+// FALSE: function requestTemperature() etc will wait a set time (worst case scenario) for a conversion to complete
+void DallasTemperature::setCheckForConversion(bool flag)
+{
+	checkForConversion = flag;
+}
+
+// gets the value of the waitForConversion flag
+bool DallasTemperature::getCheckForConversion()
+{
+	return checkForConversion;
+}
+
+bool DallasTemperature::isConversionAvailable(uint8_t* deviceAddress)
+{
+	// Check if the clock has been raised indicating the conversion is complete
+  	ScratchPad scratchPad;
+  	readScratchPad(deviceAddress, scratchPad);
+	return scratchPad[0];
+}	
+
+
+// sends command for all devices on the bus to perform a temperature conversion
+void DallasTemperature::requestTemperatures()
+{
+  _wire->reset();
+  _wire->skip();
+  _wire->write(STARTCONVO, parasite);
+
+  // ASYNC mode?
+  if (!waitForConversion) return; 
+  blockTillConversionComplete(&bitResolution, 0);
+
+  return;
+}
+
+// sends command for one device to perform a temperature by address
+// returns FALSE if device is disconnected
+// returns TRUE  otherwise
+bool DallasTemperature::requestTemperaturesByAddress(uint8_t* deviceAddress)
+{
+
+  _wire->reset();
+  _wire->select(deviceAddress);
+  _wire->write(STARTCONVO, parasite);
+  
+    // check device
+  ScratchPad scratchPad;
+  if (!isConnected(deviceAddress, scratchPad)) return false;
+  
+  
+  // ASYNC mode?
+  if (!waitForConversion) return true;   
+  uint8_t bitResolution = getResolution(deviceAddress);
+  blockTillConversionComplete(&bitResolution, deviceAddress);
+  
+  return true;
+}
+
+
+void DallasTemperature::blockTillConversionComplete(uint8_t* bitResolution, uint8_t* deviceAddress)
+{
+	if(deviceAddress != 0 && checkForConversion && !parasite)
+	{
+	  	// Continue to check if the IC has responded with a temperature
+	  	// NB: Could cause issues with multiple devices (one device may respond faster)
+	  	unsigned long start = millis();
+		while(!isConversionAvailable(0) && ((millis() - start) < 750));	
+	}
+	
+  	// Wait a fix number of cycles till conversion is complete (based on IC datasheet)
+	  switch (*bitResolution)
+	  {
+	    case 9:
+	      delay(94);
+	      break;
+	    case 10:
+	      delay(188);
+	      break;
+	    case 11:
+	      delay(375);
+	      break;
+	    case 12:
+	    default:
+	      delay(750);
+	      break;
+	  }
+
+}
+
+// sends command for one device to perform a temp conversion by index
+bool DallasTemperature::requestTemperaturesByIndex(uint8_t deviceIndex)
+{
+  DeviceAddress deviceAddress;
+  getAddress(deviceAddress, deviceIndex);
+  return requestTemperaturesByAddress(deviceAddress);
+}
+
+// Fetch temperature for device index
+float DallasTemperature::getTempCByIndex(uint8_t deviceIndex)
+{
+  DeviceAddress deviceAddress;
+  getAddress(deviceAddress, deviceIndex);
+  return getTempC((uint8_t*)deviceAddress);
+}
+
+// Fetch temperature for device index
+float DallasTemperature::getTempFByIndex(uint8_t deviceIndex)
+{
+  return toFahrenheit(getTempCByIndex(deviceIndex));
+}
+
+// reads scratchpad and returns the temperature in degrees C
+float DallasTemperature::calculateTemperature(uint8_t* deviceAddress, uint8_t* scratchPad)
+{
+  int16_t rawTemperature = (((int16_t)scratchPad[TEMP_MSB]) << 8) | scratchPad[TEMP_LSB];
+
+  switch (deviceAddress[0])
+  {
+    case MAX31850MODEL:
+      if (scratchPad[0] & 0x1) {
+	return NAN;
+      } else {
+	return (float)rawTemperature * 0.0625;
+      }
+      break;
+    case DS18B20MODEL:
+    case DS1822MODEL:
+      switch (scratchPad[CONFIGURATION])
+      {
+        case TEMP_12_BIT:
+          return (float)rawTemperature * 0.0625;
+          break;
+        case TEMP_11_BIT:
+          return (float)(rawTemperature >> 1) * 0.125;
+          break;
+        case TEMP_10_BIT:
+          return (float)(rawTemperature >> 2) * 0.25;
+          break;
+        case TEMP_9_BIT:
+          return (float)(rawTemperature >> 3) * 0.5;
+          break;
+      }
+      break;
+    case DS18S20MODEL:
+      /*
+
+      Resolutions greater than 9 bits can be calculated using the data from
+      the temperature, COUNT REMAIN and COUNT PER �C registers in the
+      scratchpad. Note that the COUNT PER �C register is hard-wired to 16
+      (10h). After reading the scratchpad, the TEMP_READ value is obtained
+      by truncating the 0.5�C bit (bit 0) from the temperature data. The
+      extended resolution temperature can then be calculated using the
+      following equation:
+
+                                       COUNT_PER_C - COUNT_REMAIN
+      TEMPERATURE = TEMP_READ - 0.25 + --------------------------
+                                               COUNT_PER_C
+      */
+
+      // Good spot. Thanks Nic Johns for your contribution
+      return (float)(rawTemperature >> 1) - 0.25 +((float)(scratchPad[COUNT_PER_C] - scratchPad[COUNT_REMAIN]) / (float)scratchPad[COUNT_PER_C] );
+      break;
+  }
+}
+
+// returns temperature in degrees C or DEVICE_DISCONNECTED if the
+// device's scratch pad cannot be read successfully.
+// the numeric value of DEVICE_DISCONNECTED is defined in
+// DallasTemperature.h. It is a large negative number outside the
+// operating range of the device
+float DallasTemperature::getTempC(uint8_t* deviceAddress)
+{
+  // TODO: Multiple devices (up to 64) on the same bus may take 
+  //       some time to negotiate a response
+  // What happens in case of collision?
+
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad)) return calculateTemperature(deviceAddress, scratchPad);
+  return DEVICE_DISCONNECTED;
+}
+
+// returns temperature in degrees F
+// TODO: - when getTempC returns DEVICE_DISCONNECTED 
+//        -127 gets converted to -196.6 F
+float DallasTemperature::getTempF(uint8_t* deviceAddress)
+{
+  return toFahrenheit(getTempC(deviceAddress));
+}
+
+// returns true if the bus requires parasite power
+bool DallasTemperature::isParasitePowerMode(void)
+{
+  return parasite;
+}
+
+#if REQUIRESALARMS
+
+/*
+
+ALARMS:
+
+TH and TL Register Format
+
+BIT 7 BIT 6 BIT 5 BIT 4 BIT 3 BIT 2 BIT 1 BIT 0
+  S    2^6   2^5   2^4   2^3   2^2   2^1   2^0
+
+Only bits 11 through 4 of the temperature register are used
+in the TH and TL comparison since TH and TL are 8-bit
+registers. If the measured temperature is lower than or equal
+to TL or higher than or equal to TH, an alarm condition exists
+and an alarm flag is set inside the DS18B20. This flag is
+updated after every temperature measurement; therefore, if the
+alarm condition goes away, the flag will be turned off after
+the next temperature conversion.
+
+*/
+
+// sets the high alarm temperature for a device in degrees celsius
+// accepts a float, but the alarm resolution will ignore anything
+// after a decimal point.  valid range is -55C - 125C
+void DallasTemperature::setHighAlarmTemp(uint8_t* deviceAddress, char celsius)
+{
+  // make sure the alarm temperature is within the device's range
+  if (celsius > 125) celsius = 125;
+  else if (celsius < -55) celsius = -55;
+
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad))
+  {
+    scratchPad[HIGH_ALARM_TEMP] = (uint8_t)celsius;
+    writeScratchPad(deviceAddress, scratchPad);
+  }
+}
+
+// sets the low alarm temperature for a device in degreed celsius
+// accepts a float, but the alarm resolution will ignore anything
+// after a decimal point.  valid range is -55C - 125C
+void DallasTemperature::setLowAlarmTemp(uint8_t* deviceAddress, char celsius)
+{
+  // make sure the alarm temperature is within the device's range
+  if (celsius > 125) celsius = 125;
+  else if (celsius < -55) celsius = -55;
+
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad))
+  {
+    scratchPad[LOW_ALARM_TEMP] = (uint8_t)celsius;
+    writeScratchPad(deviceAddress, scratchPad);
+  }
+}
+
+// returns a char with the current high alarm temperature or
+// DEVICE_DISCONNECTED for an address
+char DallasTemperature::getHighAlarmTemp(uint8_t* deviceAddress)
+{
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad)) return (char)scratchPad[HIGH_ALARM_TEMP];
+  return DEVICE_DISCONNECTED;
+}
+
+// returns a char with the current low alarm temperature or
+// DEVICE_DISCONNECTED for an address
+char DallasTemperature::getLowAlarmTemp(uint8_t* deviceAddress)
+{
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad)) return (char)scratchPad[LOW_ALARM_TEMP];
+  return DEVICE_DISCONNECTED;
+}
+
+// resets internal variables used for the alarm search
+void DallasTemperature::resetAlarmSearch()
+{
+  alarmSearchJunction = -1;
+  alarmSearchExhausted = 0;
+  for(uint8_t i = 0; i < 7; i++)
+    alarmSearchAddress[i] = 0;
+}
+
+// This is a modified version of the OneWire::search method.
+//
+// Also added the OneWire search fix documented here:
+// http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295
+//
+// Perform an alarm search. If this function returns a '1' then it has
+// enumerated the next device and you may retrieve the ROM from the
+// OneWire::address variable. If there are no devices, no further
+// devices, or something horrible happens in the middle of the
+// enumeration then a 0 is returned.  If a new device is found then
+// its address is copied to newAddr.  Use
+// DallasTemperature::resetAlarmSearch() to start over.
+bool DallasTemperature::alarmSearch(uint8_t* newAddr)
+{
+  uint8_t i;
+  char lastJunction = -1;
+  uint8_t done = 1;
+
+  if (alarmSearchExhausted) return false;
+  if (!_wire->reset()) return false;
+
+  // send the alarm search command
+  _wire->write(0xEC, 0);
+
+  for(i = 0; i < 64; i++)
+  {
+    uint8_t a = _wire->read_bit( );
+    uint8_t nota = _wire->read_bit( );
+    uint8_t ibyte = i / 8;
+    uint8_t ibit = 1 << (i & 7);
+
+    // I don't think this should happen, this means nothing responded, but maybe if
+    // something vanishes during the search it will come up.
+    if (a && nota) return false;
+
+    if (!a && !nota)
+    {
+      if (i == alarmSearchJunction)
+      {
+        // this is our time to decide differently, we went zero last time, go one.
+        a = 1;
+        alarmSearchJunction = lastJunction;
+      }
+      else if (i < alarmSearchJunction)
+      {
+        // take whatever we took last time, look in address
+        if (alarmSearchAddress[ibyte] & ibit) a = 1;
+        else
+        {
+          // Only 0s count as pending junctions, we've already exhasuted the 0 side of 1s
+          a = 0;
+          done = 0;
+          lastJunction = i;
+        }
+      }
+      else
+      {
+        // we are blazing new tree, take the 0
+        a = 0;
+        alarmSearchJunction = i;
+        done = 0;
+      }
+      // OneWire search fix
+      // See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295
+    }
+
+    if (a) alarmSearchAddress[ibyte] |= ibit;
+    else alarmSearchAddress[ibyte] &= ~ibit;
+
+    _wire->write_bit(a);
+  }
+
+  if (done) alarmSearchExhausted = 1;
+  for (i = 0; i < 8; i++) newAddr[i] = alarmSearchAddress[i];
+  return true;
+}
+
+// returns true if device address has an alarm condition
+// TODO: can this be done with only TEMP_MSB REGISTER (faster)
+//       if ((char) scratchPad[TEMP_MSB] <= (char) scratchPad[LOW_ALARM_TEMP]) return true;
+//       if ((char) scratchPad[TEMP_MSB] >= (char) scratchPad[HIGH_ALARM_TEMP]) return true;
+bool DallasTemperature::hasAlarm(uint8_t* deviceAddress)
+{
+  ScratchPad scratchPad;
+  if (isConnected(deviceAddress, scratchPad))
+  {
+    float temp = calculateTemperature(deviceAddress, scratchPad);
+
+    // check low alarm
+    if ((char)temp <= (char)scratchPad[LOW_ALARM_TEMP]) return true;
+
+    // check high alarm
+    if ((char)temp >= (char)scratchPad[HIGH_ALARM_TEMP]) return true;
+  }
+
+  // no alarm
+  return false;
+}
+
+// returns true if any device is reporting an alarm condition on the bus
+bool DallasTemperature::hasAlarm(void)
+{
+  DeviceAddress deviceAddress;
+  resetAlarmSearch();
+  return alarmSearch(deviceAddress);
+}
+
+// runs the alarm handler for all devices returned by alarmSearch()
+void DallasTemperature::processAlarms(void)
+{
+  resetAlarmSearch();
+  DeviceAddress alarmAddr;
+
+  while (alarmSearch(alarmAddr))
+  {
+    if (validAddress(alarmAddr))
+      _AlarmHandler(alarmAddr);
+  }
+}
+
+// sets the alarm handler
+void DallasTemperature::setAlarmHandler(AlarmHandler *handler)
+{
+  _AlarmHandler = handler;
+}
+
+// The default alarm handler
+void DallasTemperature::defaultAlarmHandler(uint8_t* deviceAddress)
+{
+}
+
+#endif
+
+// Convert float celsius to fahrenheit
+float DallasTemperature::toFahrenheit(float celsius)
+{
+  return (celsius * 1.8) + 32;
+}
+
+// Convert float fahrenheit to celsius
+float DallasTemperature::toCelsius(float fahrenheit)
+{
+  return (fahrenheit - 32) / 1.8;
+}
+
+#if REQUIRESNEW
+
+// MnetCS - Allocates memory for DallasTemperature. Allows us to instance a new object
+void* DallasTemperature::operator new(unsigned int size) // Implicit NSS obj size
+{
+  void * p; // void pointer
+  p = malloc(size); // Allocate memory
+  memset((DallasTemperature*)p,0,size); // Initalise memory
+
+  //!!! CANT EXPLICITLY CALL CONSTRUCTOR - workaround by using an init() methodR - workaround by using an init() method
+  return (DallasTemperature*) p; // Cast blank region to NSS pointer
+}
+
+// MnetCS 2009 -  Unallocates the memory used by this instance
+void DallasTemperature::operator delete(void* p)
+{
+  DallasTemperature* pNss =  (DallasTemperature*) p; // Cast to NSS pointer
+  pNss->~DallasTemperature(); // Destruct the object
+
+  free(p); // Free the memory
+}
+
+#endif
diff --git a/libraries/MAX31850_DallasTemp/DallasTemperature.h b/libraries/MAX31850_DallasTemp/DallasTemperature.h
new file mode 100644
index 0000000..4d7be1f
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/DallasTemperature.h
@@ -0,0 +1,243 @@
+#ifndef DallasTemperature_h
+#define DallasTemperature_h
+
+#define DALLASTEMPLIBVERSION "3.7.2"
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// set to true to include code for new and delete operators
+#ifndef REQUIRESNEW
+#define REQUIRESNEW false
+#endif
+
+// set to true to include code implementing alarm search functions
+#ifndef REQUIRESALARMS
+#define REQUIRESALARMS true
+#endif
+
+#include <inttypes.h>
+#include <OneWire.h>
+
+// Model IDs
+#define DS18S20MODEL 0x10
+#define DS18B20MODEL 0x28
+#define DS1822MODEL  0x22
+#define MAX31850MODEL 0x3B
+
+// OneWire commands
+#define STARTCONVO      0x44  // Tells device to take a temperature reading and put it on the scratchpad
+#define COPYSCRATCH     0x48  // Copy EEPROM
+#define READSCRATCH     0xBE  // Read EEPROM
+#define WRITESCRATCH    0x4E  // Write to EEPROM
+#define RECALLSCRATCH   0xB8  // Reload from last known
+#define READPOWERSUPPLY 0xB4  // Determine if device needs parasite power
+#define ALARMSEARCH     0xEC  // Query bus for devices with an alarm condition
+
+// Scratchpad locations
+#define TEMP_LSB        0
+#define TEMP_MSB        1
+#define HIGH_ALARM_TEMP 2
+#define LOW_ALARM_TEMP  3
+#define CONFIGURATION   4
+#define INTERNAL_BYTE   5
+#define COUNT_REMAIN    6
+#define COUNT_PER_C     7
+#define SCRATCHPAD_CRC  8
+
+// Device resolution
+#define TEMP_9_BIT  0x1F //  9 bit
+#define TEMP_10_BIT 0x3F // 10 bit
+#define TEMP_11_BIT 0x5F // 11 bit
+#define TEMP_12_BIT 0x7F // 12 bit
+
+// Error Codes
+#define DEVICE_DISCONNECTED -127
+
+typedef uint8_t DeviceAddress[8];
+
+class DallasTemperature
+{
+  public:
+
+  DallasTemperature(OneWire*);
+
+  // initalise bus
+  void begin(void);
+
+  // returns the number of devices found on the bus
+  uint8_t getDeviceCount(void);
+  
+  // Is a conversion complete on the wire?
+  bool isConversionComplete(void);
+  
+  // returns true if address is valid
+  bool validAddress(uint8_t*);
+
+  // finds an address at a given index on the bus 
+  bool getAddress(uint8_t*, const uint8_t);
+  
+  // attempt to determine if the device at the given address is connected to the bus
+  bool isConnected(uint8_t*);
+
+  // attempt to determine if the device at the given address is connected to the bus
+  // also allows for updating the read scratchpad
+  bool isConnected(uint8_t*, uint8_t*);
+
+  // read device's scratchpad
+  void readScratchPad(uint8_t*, uint8_t*);
+
+  // write device's scratchpad
+  void writeScratchPad(uint8_t*, const uint8_t*);
+
+  // read device's power requirements
+  bool readPowerSupply(uint8_t*);
+
+  // get global resolution
+  uint8_t getResolution();
+  
+  // set global resolution to 9, 10, 11, or 12 bits
+  void setResolution(uint8_t);
+
+  // returns the device resolution, 9-12
+  uint8_t getResolution(uint8_t*);
+
+  // set resolution of a device to 9, 10, 11, or 12 bits
+  bool setResolution(uint8_t*, uint8_t);
+  
+  // sets/gets the waitForConversion flag
+  void setWaitForConversion(bool);
+  bool getWaitForConversion(void);
+  
+  // sets/gets the checkForConversion flag
+  void setCheckForConversion(bool);
+  bool getCheckForConversion(void);
+  
+  // sends command for all devices on the bus to perform a temperature conversion 
+  void requestTemperatures(void);
+   
+  // sends command for one device to perform a temperature conversion by address
+  bool requestTemperaturesByAddress(uint8_t*);
+
+  // sends command for one device to perform a temperature conversion by index
+  bool requestTemperaturesByIndex(uint8_t);
+
+  // returns temperature in degrees C
+  float getTempC(uint8_t*);
+
+  // returns temperature in degrees F
+  float getTempF(uint8_t*);
+
+  // Get temperature for device index (slow)
+  float getTempCByIndex(uint8_t);
+  
+  // Get temperature for device index (slow)
+  float getTempFByIndex(uint8_t);
+  
+  // returns true if the bus requires parasite power
+  bool isParasitePowerMode(void);
+  
+  bool isConversionAvailable(uint8_t*);
+
+  #if REQUIRESALARMS
+  
+  typedef void AlarmHandler(uint8_t*);
+
+  // sets the high alarm temperature for a device
+  // accepts a char.  valid range is -55C - 125C
+  void setHighAlarmTemp(uint8_t*, const char);
+
+  // sets the low alarm temperature for a device
+  // accepts a char.  valid range is -55C - 125C
+  void setLowAlarmTemp(uint8_t*, const char);
+
+  // returns a signed char with the current high alarm temperature for a device
+  // in the range -55C - 125C
+  char getHighAlarmTemp(uint8_t*);
+
+  // returns a signed char with the current low alarm temperature for a device
+  // in the range -55C - 125C
+  char getLowAlarmTemp(uint8_t*);
+  
+  // resets internal variables used for the alarm search
+  void resetAlarmSearch(void);
+
+  // search the wire for devices with active alarms
+  bool alarmSearch(uint8_t*);
+
+  // returns true if ia specific device has an alarm
+  bool hasAlarm(uint8_t*);
+
+  // returns true if any device is reporting an alarm on the bus
+  bool hasAlarm(void);
+
+  // runs the alarm handler for all devices returned by alarmSearch()
+  void processAlarms(void);
+  
+  // sets the alarm handler
+  void setAlarmHandler(AlarmHandler *);
+  
+  // The default alarm handler
+  static void defaultAlarmHandler(uint8_t*);
+
+  #endif
+
+  // convert from celcius to farenheit
+  static float toFahrenheit(const float);
+
+  // convert from farenheit to celsius
+  static float toCelsius(const float);
+
+  #if REQUIRESNEW
+
+  // initalize memory area
+  void* operator new (unsigned int);
+
+  // delete memory reference
+  void operator delete(void*);
+  
+  #endif
+
+  private:
+  typedef uint8_t ScratchPad[9];
+  
+  // parasite power on or off
+  bool parasite;
+
+  // used to determine the delay amount needed to allow for the
+  // temperature conversion to take place
+  uint8_t bitResolution;
+  
+  // used to requestTemperature with or without delay
+  bool waitForConversion;
+  
+  // used to requestTemperature to dynamically check if a conversion is complete
+  bool checkForConversion;
+  
+  // count of devices on the bus
+  uint8_t devices;
+  
+  // Take a pointer to one wire instance
+  OneWire* _wire;
+
+  // reads scratchpad and returns the temperature in degrees C
+  float calculateTemperature(uint8_t*, uint8_t*);
+  
+  void	blockTillConversionComplete(uint8_t*,uint8_t*);
+  
+  #if REQUIRESALARMS
+
+  // required for alarmSearch 
+  uint8_t alarmSearchAddress[8];
+  char alarmSearchJunction;
+  uint8_t alarmSearchExhausted;
+
+  // the alarm handler function pointer
+  AlarmHandler *_AlarmHandler;
+
+  #endif
+  
+};
+#endif
diff --git a/libraries/MAX31850_DallasTemp/README.TXT b/libraries/MAX31850_DallasTemp/README.TXT
new file mode 100644
index 0000000..7b1c382
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/README.TXT
@@ -0,0 +1,53 @@
+Arduino Library for Dallas Temperature ICs
+==========================================
+
+For MAX31850 support, be sure to also get OneWire from
+https://github.com/adafruit/MAX31850_OneWire
+
+Usage
+-----
+
+This library supports the following devices: 
+    MAX31850
+    DS18B20
+    DS18S20 - Please note there appears to be an issue with this series.
+    DS1822
+
+You will need a pull-up resistor of about 5 KOhm between the 1-Wire data line
+and your 3 or 5V power. If you are using the DS18B20, ground pins 1 and 3. The
+centre pin is the data line '1-wire'.
+
+Credits
+-------
+
+The OneWire code has been derived from
+http://www.arduino.cc/playground/Learning/OneWire.
+Miles Burton <miles@mnetcs.com> originally developed this library.
+Tim Newsome <nuisance@casualhacker.net> added support for multiple sensors on
+the same bus.
+Guil Barros [gfbarros@bappos.com] added getTempByAddress (v3.5)
+Rob Tillaart [rob.tillaart@gmail.com] added async modus (v3.7.0)
+ladyad added MAX31850 support
+
+Website
+-------
+
+You can find the latest version of the library at
+http://milesburton.com/index.php?title=Dallas_Temperature_Control_Library
+
+License
+-------
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/libraries/MAX31850_DallasTemp/change.txt b/libraries/MAX31850_DallasTemp/change.txt
new file mode 100644
index 0000000..42564ca
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/change.txt
@@ -0,0 +1,85 @@
+
+This file contains the change history of the Dallas Temperature Control Library.
+
+VERSION 3.7.2 BETA
+===================
+DATE: 6 DEC  2011
+
+- Jordan Hochenbaum [jhochenbaum@gmail.com] updated library for compatibility with Arduino 1.0.
+
+VERSION 3.7.0 BETA
+===================
+DATE: 11 JAN  2011
+
+- Rob Tillaart [rob.tillaart@gmail.com] added async modus (v3.7.0)
+  The library is backwards compatible with version 3.6.0
+
+  MAJOR: async modus
+  ------------------
+- Added - private bool waitForConversion. 
+This boolean is default set to true in the Constructor to keep the library backwards compatible. If this flag is true calls to requestTemperatures(), requestTemperaturesByAddress() et al, will be blocking with the appropiate time specified (in datasheet) for the resolution used. If the flag is set to false, requestTemperatures() et al, will return immediately after the conversion command is send over the 1-wire interface. The programmer is responsible to wait long enough before reading the temperature values. This enables the application to do other things while waiting for a new reading, like calculations, update LCD, read/write other IO lines etc. See examples.
+
+- Added - void setWaitForConversion(bool); 
+To set the flag to true or false, depending on the modus needed.
+
+- Added - bool getWaitForConversion(void); 
+To get the current value of the flag.
+
+- Changed - void requestTemperatures(void);
+Added a test (false == waitForConversion) to return immediately after the conversion command instead of waiting until the conversion is ready.
+ 
+- Changed - bool requestTemperaturesByAddress(uint8_t*); 
+Added a test (false == waitForConversion) to return immediately after the conversion command instead of waiting until the conversion is ready.
+
+
+  MINOR version number
+  --------------------
+- Added - #define DALLASTEMPLIBVERSION "3.7.0" 
+To indicate the version number in .h file 
+  
+  
+  MINOR internal var bitResolution
+  ----------------------------
+- Changed - private int conversionDelay - is renamed to - private int bitResolution
+As this variable holds the resolution. The delay for the conversion is derived from it.
+
+- Changed - uint8_t getResolution(uint8_t* deviceAddress);
+If the device is not connected, it returns 0, otherwise it returns the resolution of the device.
+
+- Changed - bool setResolution(uint8_t* deviceAddress, uint8_t newResolution);
+If the device is not connected, it returns FALSE (fail), otherwise it returns TRUE (succes).
+
+- Added - uint8_t getResolution();
+Returns bitResolution.
+
+- Added - void setResolution(uint8_t newResolution)
+Sets the internal variable bitResolution, and all devices to this value
+
+
+  MINOR check connected state
+  ----------------------------
+- Changed - bool requestTemperaturesByIndex(deviceIndex) 
+Changed return type from void to bool. The function returns false if the device identified with [deviceIndex] is not found on the bus and true otherwise.
+
+- Changed - bool requestTemperaturesByAddress(deviceAddress)
+Changed return type from void to bool. The function returns false if the device identified with [deviceAddress] is not found on the bus and true otherwise.
+Added code to handle the DS18S20 which has a 9 bit resolution separately.
+Changed code so the blocking delay matches the bitResolution set in the device with deviceAddress.
+
+- Changed - bool requestTemperaturesByIndex(uint8_t deviceIndex)
+Changed return type from void to bool. The function returns false if the device identified with [deviceIndex] is not found on the bus and true otherwise.
+
+
+
+VERSION 3.6.0
+==============
+DATE: 2010-10-10
+
+- no detailed change history known except:
+
+- The OneWire code has been derived from
+http://www.arduino.cc/playground/Learning/OneWire.
+- Miles Burton <miles@mnetcs.com> originally developed this library.
+- Tim Newsome <nuisance@casualhacker.net> added support for multiple sensors on
+the same bus.
+- Guil Barros [gfbarros@bappos.com] added getTempByAddress (v3.5)
diff --git a/libraries/MAX31850_DallasTemp/examples/Multiple/Multiple.pde b/libraries/MAX31850_DallasTemp/examples/Multiple/Multiple.pde
new file mode 100644
index 0000000..9e7d6a8
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/examples/Multiple/Multiple.pde
@@ -0,0 +1,140 @@
+#include <OneWire.h>
+#include <DallasTemperature.h>
+
+// Data wire is plugged into port 2 on the Arduino
+#define ONE_WIRE_BUS 2
+#define TEMPERATURE_PRECISION 9
+
+// Setup a oneWire instance to communicate with any OneWire devices (not just Maxim/Dallas temperature ICs)
+OneWire oneWire(ONE_WIRE_BUS);
+
+// Pass our oneWire reference to Dallas Temperature. 
+DallasTemperature sensors(&oneWire);
+
+// arrays to hold device addresses
+DeviceAddress insideThermometer, outsideThermometer;
+
+void setup(void)
+{
+  // start serial port
+  Serial.begin(9600);
+  Serial.println("Dallas Temperature IC Control Library Demo");
+
+  // Start up the library
+  sensors.begin();
+
+  // locate devices on the bus
+  Serial.print("Locating devices...");
+  Serial.print("Found ");
+  Serial.print(sensors.getDeviceCount(), DEC);
+  Serial.println(" devices.");
+
+  // report parasite power requirements
+  Serial.print("Parasite power is: "); 
+  if (sensors.isParasitePowerMode()) Serial.println("ON");
+  else Serial.println("OFF");
+
+  // assign address manually.  the addresses below will beed to be changed
+  // to valid device addresses on your bus.  device address can be retrieved
+  // by using either oneWire.search(deviceAddress) or individually via
+  // sensors.getAddress(deviceAddress, index)
+  //insideThermometer = { 0x28, 0x1D, 0x39, 0x31, 0x2, 0x0, 0x0, 0xF0 };
+  //outsideThermometer   = { 0x28, 0x3F, 0x1C, 0x31, 0x2, 0x0, 0x0, 0x2 };
+
+  // search for devices on the bus and assign based on an index.  ideally,
+  // you would do this to initially discover addresses on the bus and then 
+  // use those addresses and manually assign them (see above) once you know 
+  // the devices on your bus (and assuming they don't change).
+  // 
+  // method 1: by index
+  if (!sensors.getAddress(insideThermometer, 0)) Serial.println("Unable to find address for Device 0"); 
+  if (!sensors.getAddress(outsideThermometer, 1)) Serial.println("Unable to find address for Device 1"); 
+
+  // method 2: search()
+  // search() looks for the next device. Returns 1 if a new address has been
+  // returned. A zero might mean that the bus is shorted, there are no devices, 
+  // or you have already retrieved all of them.  It might be a good idea to 
+  // check the CRC to make sure you didn't get garbage.  The order is 
+  // deterministic. You will always get the same devices in the same order
+  //
+  // Must be called before search()
+  //oneWire.reset_search();
+  // assigns the first address found to insideThermometer
+  //if (!oneWire.search(insideThermometer)) Serial.println("Unable to find address for insideThermometer");
+  // assigns the seconds address found to outsideThermometer
+  //if (!oneWire.search(outsideThermometer)) Serial.println("Unable to find address for outsideThermometer");
+
+  // show the addresses we found on the bus
+  Serial.print("Device 0 Address: ");
+  printAddress(insideThermometer);
+  Serial.println();
+
+  Serial.print("Device 1 Address: ");
+  printAddress(outsideThermometer);
+  Serial.println();
+
+  // set the resolution to 9 bit
+  sensors.setResolution(insideThermometer, TEMPERATURE_PRECISION);
+  sensors.setResolution(outsideThermometer, TEMPERATURE_PRECISION);
+
+  Serial.print("Device 0 Resolution: ");
+  Serial.print(sensors.getResolution(insideThermometer), DEC); 
+  Serial.println();
+
+  Serial.print("Device 1 Resolution: ");
+  Serial.print(sensors.getResolution(outsideThermometer), DEC); 
+  Serial.println();
+}
+
+// function to print a device address
+void printAddress(DeviceAddress deviceAddress)
+{
+  for (uint8_t i = 0; i < 8; i++)
+  {
+    // zero pad the address if necessary
+    if (deviceAddress[i] < 16) Serial.print("0");
+    Serial.print(deviceAddress[i], HEX);
+  }
+}
+
+// function to print the temperature for a device
+void printTemperature(DeviceAddress deviceAddress)
+{
+  float tempC = sensors.getTempC(deviceAddress);
+  Serial.print("Temp C: ");
+  Serial.print(tempC);
+  Serial.print(" Temp F: ");
+  Serial.print(DallasTemperature::toFahrenheit(tempC));
+}
+
+// function to print a device's resolution
+void printResolution(DeviceAddress deviceAddress)
+{
+  Serial.print("Resolution: ");
+  Serial.print(sensors.getResolution(deviceAddress));
+  Serial.println();    
+}
+
+// main function to print information about a device
+void printData(DeviceAddress deviceAddress)
+{
+  Serial.print("Device Address: ");
+  printAddress(deviceAddress);
+  Serial.print(" ");
+  printTemperature(deviceAddress);
+  Serial.println();
+}
+
+void loop(void)
+{ 
+  // call sensors.requestTemperatures() to issue a global temperature 
+  // request to all devices on the bus
+  Serial.print("Requesting temperatures...");
+  sensors.requestTemperatures();
+  Serial.println("DONE");
+
+  // print the device information
+  printData(insideThermometer);
+  printData(outsideThermometer);
+}
+
diff --git a/libraries/MAX31850_DallasTemp/examples/Simple/Simple.pde b/libraries/MAX31850_DallasTemp/examples/Simple/Simple.pde
new file mode 100644
index 0000000..e4383bf
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/examples/Simple/Simple.pde
@@ -0,0 +1,33 @@
+#include <OneWire.h>
+#include <DallasTemperature.h>
+
+// Data wire is plugged into port 2 on the Arduino
+#define ONE_WIRE_BUS 2
+
+// Setup a oneWire instance to communicate with any OneWire devices (not just Maxim/Dallas temperature ICs)
+OneWire oneWire(ONE_WIRE_BUS);
+
+// Pass our oneWire reference to Dallas Temperature. 
+DallasTemperature sensors(&oneWire);
+
+void setup(void)
+{
+  // start serial port
+  Serial.begin(9600);
+  Serial.println("Dallas Temperature IC Control Library Demo");
+
+  // Start up the library
+  sensors.begin();
+}
+
+void loop(void)
+{ 
+  // call sensors.requestTemperatures() to issue a global temperature 
+  // request to all devices on the bus
+  Serial.print("Requesting temperatures...");
+  sensors.requestTemperatures(); // Send the command to get temperatures
+  Serial.println("DONE");
+  
+  Serial.print("Temperature for the device 1 (index 0) is: ");
+  Serial.println(sensors.getTempCByIndex(0));  
+}
diff --git a/libraries/MAX31850_DallasTemp/examples/Single/Single.pde b/libraries/MAX31850_DallasTemp/examples/Single/Single.pde
new file mode 100644
index 0000000..784eb7a
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/examples/Single/Single.pde
@@ -0,0 +1,109 @@
+#include <OneWire.h>
+#include <DallasTemperature.h>
+
+// Data wire is plugged into port 2 on the Arduino
+#define ONE_WIRE_BUS 2
+
+// Setup a oneWire instance to communicate with any OneWire devices (not just Maxim/Dallas temperature ICs)
+OneWire oneWire(ONE_WIRE_BUS);
+
+// Pass our oneWire reference to Dallas Temperature. 
+DallasTemperature sensors(&oneWire);
+
+// arrays to hold device address
+DeviceAddress insideThermometer;
+
+void setup(void)
+{
+  // start serial port
+  Serial.begin(9600);
+  Serial.println("Dallas Temperature IC Control Library Demo");
+
+  // locate devices on the bus
+  Serial.print("Locating devices...");
+  sensors.begin();
+  Serial.print("Found ");
+  Serial.print(sensors.getDeviceCount(), DEC);
+  Serial.println(" devices.");
+
+  // report parasite power requirements
+  Serial.print("Parasite power is: "); 
+  if (sensors.isParasitePowerMode()) Serial.println("ON");
+  else Serial.println("OFF");
+  
+  // assign address manually.  the addresses below will beed to be changed
+  // to valid device addresses on your bus.  device address can be retrieved
+  // by using either oneWire.search(deviceAddress) or individually via
+  // sensors.getAddress(deviceAddress, index)
+  //insideThermometer = { 0x28, 0x1D, 0x39, 0x31, 0x2, 0x0, 0x0, 0xF0 };
+
+  // Method 1:
+  // search for devices on the bus and assign based on an index.  ideally,
+  // you would do this to initially discover addresses on the bus and then 
+  // use those addresses and manually assign them (see above) once you know 
+  // the devices on your bus (and assuming they don't change).
+  if (!sensors.getAddress(insideThermometer, 0)) Serial.println("Unable to find address for Device 0"); 
+  
+  // method 2: search()
+  // search() looks for the next device. Returns 1 if a new address has been
+  // returned. A zero might mean that the bus is shorted, there are no devices, 
+  // or you have already retrieved all of them.  It might be a good idea to 
+  // check the CRC to make sure you didn't get garbage.  The order is 
+  // deterministic. You will always get the same devices in the same order
+  //
+  // Must be called before search()
+  //oneWire.reset_search();
+  // assigns the first address found to insideThermometer
+  //if (!oneWire.search(insideThermometer)) Serial.println("Unable to find address for insideThermometer");
+
+  // show the addresses we found on the bus
+  Serial.print("Device 0 Address: ");
+  printAddress(insideThermometer);
+  Serial.println();
+
+  // set the resolution to 9 bit (Each Dallas/Maxim device is capable of several different resolutions)
+  sensors.setResolution(insideThermometer, 9);
+ 
+  Serial.print("Device 0 Resolution: ");
+  Serial.print(sensors.getResolution(insideThermometer), DEC); 
+  Serial.println();
+}
+
+// function to print the temperature for a device
+void printTemperature(DeviceAddress deviceAddress)
+{
+  // method 1 - slower
+  //Serial.print("Temp C: ");
+  //Serial.print(sensors.getTempC(deviceAddress));
+  //Serial.print(" Temp F: ");
+  //Serial.print(sensors.getTempF(deviceAddress)); // Makes a second call to getTempC and then converts to Fahrenheit
+
+  // method 2 - faster
+  float tempC = sensors.getTempC(deviceAddress);
+  Serial.print("Temp C: ");
+  Serial.print(tempC);
+  Serial.print(" Temp F: ");
+  Serial.println(DallasTemperature::toFahrenheit(tempC)); // Converts tempC to Fahrenheit
+}
+
+void loop(void)
+{ 
+  // call sensors.requestTemperatures() to issue a global temperature 
+  // request to all devices on the bus
+  Serial.print("Requesting temperatures...");
+  sensors.requestTemperatures(); // Send the command to get temperatures
+  Serial.println("DONE");
+  
+  // It responds almost immediately. Let's print out the data
+  printTemperature(insideThermometer); // Use a simple function to print out the data
+}
+
+// function to print a device address
+void printAddress(DeviceAddress deviceAddress)
+{
+  for (uint8_t i = 0; i < 8; i++)
+  {
+    if (deviceAddress[i] < 16) Serial.print("0");
+    Serial.print(deviceAddress[i], HEX);
+  }
+}
diff --git a/libraries/MAX31850_DallasTemp/examples/Tester/Tester.pde b/libraries/MAX31850_DallasTemp/examples/Tester/Tester.pde
new file mode 100644
index 0000000..4f75839
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/examples/Tester/Tester.pde
@@ -0,0 +1,124 @@
+#include <OneWire.h>
+#include <DallasTemperature.h>
+
+// Data wire is plugged into port 2 on the Arduino
+#define ONE_WIRE_BUS 2
+#define TEMPERATURE_PRECISION 9
+
+// Setup a oneWire instance to communicate with any OneWire devices (not just Maxim/Dallas temperature ICs)
+OneWire oneWire(ONE_WIRE_BUS);
+
+// Pass our oneWire reference to Dallas Temperature. 
+DallasTemperature sensors(&oneWire);
+
+int numberOfDevices; // Number of temperature devices found
+
+DeviceAddress tempDeviceAddress; // We'll use this variable to store a found device address
+
+void setup(void)
+{
+  // start serial port
+  Serial.begin(9600);
+  Serial.println("Dallas Temperature IC Control Library Demo");
+
+  // Start up the library
+  sensors.begin();
+  
+  // Grab a count of devices on the wire
+  numberOfDevices = sensors.getDeviceCount();
+  
+  // locate devices on the bus
+  Serial.print("Locating devices...");
+  
+  Serial.print("Found ");
+  Serial.print(numberOfDevices, DEC);
+  Serial.println(" devices.");
+
+  // report parasite power requirements
+  Serial.print("Parasite power is: "); 
+  if (sensors.isParasitePowerMode()) Serial.println("ON");
+  else Serial.println("OFF");
+  
+  // Loop through each device, print out address
+  for(int i=0;i<numberOfDevices; i++)
+  {
+    // Search the wire for address
+    if(sensors.getAddress(tempDeviceAddress, i))
+	{
+		Serial.print("Found device ");
+		Serial.print(i, DEC);
+		Serial.print(" with address: ");
+		printAddress(tempDeviceAddress);
+		Serial.println();
+		
+		Serial.print("Setting resolution to ");
+		Serial.println(TEMPERATURE_PRECISION, DEC);
+		
+		// set the resolution to TEMPERATURE_PRECISION bit (Each Dallas/Maxim device is capable of several different resolutions)
+		sensors.setResolution(tempDeviceAddress, TEMPERATURE_PRECISION);
+		
+		 Serial.print("Resolution actually set to: ");
+		Serial.print(sensors.getResolution(tempDeviceAddress), DEC); 
+		Serial.println();
+	}else{
+		Serial.print("Found ghost device at ");
+		Serial.print(i, DEC);
+		Serial.print(" but could not detect address. Check power and cabling");
+	}
+  }
+
+}
+
+// function to print the temperature for a device
+void printTemperature(DeviceAddress deviceAddress)
+{
+  // method 1 - slower
+  //Serial.print("Temp C: ");
+  //Serial.print(sensors.getTempC(deviceAddress));
+  //Serial.print(" Temp F: ");
+  //Serial.print(sensors.getTempF(deviceAddress)); // Makes a second call to getTempC and then converts to Fahrenheit
+
+  // method 2 - faster
+  float tempC = sensors.getTempC(deviceAddress);
+  Serial.print("Temp C: ");
+  Serial.print(tempC);
+  Serial.print(" Temp F: ");
+  Serial.println(DallasTemperature::toFahrenheit(tempC)); // Converts tempC to Fahrenheit
+}
+
+void loop(void)
+{ 
+  // call sensors.requestTemperatures() to issue a global temperature 
+  // request to all devices on the bus
+  Serial.print("Requesting temperatures...");
+  sensors.requestTemperatures(); // Send the command to get temperatures
+  Serial.println("DONE");
+  
+  
+  // Loop through each device, print out temperature data
+  for(int i=0;i<numberOfDevices; i++)
+  {
+    // Search the wire for address
+    if(sensors.getAddress(tempDeviceAddress, i))
+	{
+		// Output the device ID
+		Serial.print("Temperature for device: ");
+		Serial.println(i,DEC);
+		
+		// It responds almost immediately. Let's print out the data
+		printTemperature(tempDeviceAddress); // Use a simple function to print out the data
+	} 
+	//else ghost device! Check your power requirements and cabling
+	
+  }
+}
+
+// function to print a device address
+void printAddress(DeviceAddress deviceAddress)
+{
+  for (uint8_t i = 0; i < 8; i++)
+  {
+    if (deviceAddress[i] < 16) Serial.print("0");
+    Serial.print(deviceAddress[i], HEX);
+  }
+}
diff --git a/libraries/MAX31850_DallasTemp/keywords.txt b/libraries/MAX31850_DallasTemp/keywords.txt
new file mode 100644
index 0000000..0212d44
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/keywords.txt
@@ -0,0 +1,54 @@
+#######################################
+# Syntax Coloring Map For Ultrasound
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+DallasTemperature	KEYWORD1
+OneWire	KEYWORD1
+AlarmHandler	KEYWORD1
+DeviceAddress	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+setResolution	KEYWORD2
+getResolution	KEYWORD2
+getTempC	KEYWORD2
+toFahrenheit	KEYWORD2
+getTempF	KEYWORD2
+getTempCByIndex 	KEYWORD2
+getTempFByIndex		KEYWORD2
+setWaitForConversion	KEYWORD2
+getWaitForConversion	KEYWORD2
+requestTemperatures	KEYWORD2
+requestTemperaturesByAddress	KEYWORD2
+requestTemperaturesByIndex	KEYWORD2
+isParasitePowerMode	KEYWORD2
+begin	KEYWORD2
+getDeviceCount	KEYWORD2
+getAddress	KEYWORD2
+validAddress	KEYWORD2
+isConnected	KEYWORD2
+readScratchPad	KEYWORD2
+writeScratchPad	KEYWORD2
+readPowerSupply	KEYWORD2
+setHighAlarmTemp	KEYWORD2
+setLowAlarmTemp	KEYWORD2
+getHighAlarmTemp	KEYWORD2
+getLowAlarmTemp	KEYWORD2
+resetAlarmSearch	KEYWORD2
+alarmSearch	KEYWORD2
+hasAlarm	KEYWORD2
+toCelsius	KEYWORD2
+processAlarmss	KEYWORD2
+setAlarmHandlers	KEYWORD2
+defaultAlarmHandler	KEYWORD2
+calculateTemperature	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+
diff --git a/libraries/MAX31850_DallasTemp/library.properties b/libraries/MAX31850_DallasTemp/library.properties
new file mode 100644
index 0000000..118961c
--- /dev/null
+++ b/libraries/MAX31850_DallasTemp/library.properties
@@ -0,0 +1,9 @@
+name=MAX31850 DallasTemp
+version=1.0.0
+author=Adafruit
+maintainer=Adafruit <info@adafruit.com>
+sentence=A version of the DallasTemp Arduino library with MAX31850 support (Requires OneWire with MAX31850 support!)
+paragraph=A version of the DallasTemp Arduino library with MAX31850 support (Requires OneWire with MAX31850 support!)
+category=Sensors
+url=https://github.com/adafruit/MAX31850_DallasTemp
+architectures=*
diff --git a/libraries/MAX31850_OneWire/OneWire.cpp b/libraries/MAX31850_OneWire/OneWire.cpp
new file mode 100644
index 0000000..631813f
--- /dev/null
+++ b/libraries/MAX31850_OneWire/OneWire.cpp
@@ -0,0 +1,557 @@
+/*
+Copyright (c) 2007, Jim Studt  (original old version - many contributors since)
+
+The latest version of this library may be found at:
+  http://www.pjrc.com/teensy/td_libs_OneWire.html
+
+OneWire has been maintained by Paul Stoffregen (paul@pjrc.com) since
+January 2010.  At the time, it was in need of many bug fixes, but had
+been abandoned the original author (Jim Studt).  None of the known
+contributors were interested in maintaining OneWire.  Paul typically
+works on OneWire every 6 to 12 months.  Patches usually wait that
+long.  If anyone is interested in more actively maintaining OneWire,
+please contact Paul.
+
+Version 2.2:
+  Teensy 3.0 compatibility, Paul Stoffregen, paul@pjrc.com
+  Arduino Due compatibility, http://arduino.cc/forum/index.php?topic=141030
+  Fix DS18B20 example negative temperature
+  Fix DS18B20 example's low res modes, Ken Butcher
+  Improve reset timing, Mark Tillotson
+  Add const qualifiers, Bertrik Sikken
+  Add initial value input to crc16, Bertrik Sikken
+  Add target_search() function, Scott Roberts
+
+Version 2.1:
+  Arduino 1.0 compatibility, Paul Stoffregen
+  Improve temperature example, Paul Stoffregen
+  DS250x_PROM example, Guillermo Lovato
+  PIC32 (chipKit) compatibility, Jason Dangel, dangel.jason AT gmail.com
+  Improvements from Glenn Trewitt:
+  - crc16() now works
+  - check_crc16() does all of calculation/checking work.
+  - Added read_bytes() and write_bytes(), to reduce tedious loops.
+  - Added ds2408 example.
+  Delete very old, out-of-date readme file (info is here)
+
+Version 2.0: Modifications by Paul Stoffregen, January 2010:
+http://www.pjrc.com/teensy/td_libs_OneWire.html
+  Search fix from Robin James
+    http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+  Use direct optimized I/O in all cases
+  Disable interrupts during timing critical sections
+    (this solves many random communication errors)
+  Disable interrupts during read-modify-write I/O
+  Reduce RAM consumption by eliminating unnecessary
+    variables and trimming many to 8 bits
+  Optimize both crc8 - table version moved to flash
+
+Modified to work with larger numbers of devices - avoids loop.
+Tested in Arduino 11 alpha with 12 sensors.
+26 Sept 2008 -- Robin James
+http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+
+Updated to work with arduino-0008 and to include skip() as of
+2007/07/06. --RJL20
+
+Modified to calculate the 8-bit CRC directly, avoiding the need for
+the 256-byte lookup table to be loaded in RAM.  Tested in arduino-0010
+-- Tom Pollard, Jan 23, 2008
+
+Jim Studt's original library was modified by Josh Larios.
+
+Tom Pollard, pollard@alum.mit.edu, contributed around May 20, 2008
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Much of the code was inspired by Derek Yerger's code, though I don't
+think much of that remains.  In any event that was..
+    (copyleft) 2006 by Derek Yerger - Free to distribute freely.
+
+The CRC code was excerpted and inspired by the Dallas Semiconductor
+sample code bearing this copyright.
+//---------------------------------------------------------------------------
+// Copyright (C) 2000 Dallas Semiconductor Corporation, All Rights Reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY,  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL DALLAS SEMICONDUCTOR BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// Except as contained in this notice, the name of Dallas Semiconductor
+// shall not be used except as stated in the Dallas Semiconductor
+// Branding Policy.
+//--------------------------------------------------------------------------
+*/
+
+#include "OneWire.h"
+
+
+OneWire::OneWire(uint8_t pin)
+{
+	pinMode(pin, INPUT);
+	bitmask = PIN_TO_BITMASK(pin);
+	baseReg = PIN_TO_BASEREG(pin);
+#if ONEWIRE_SEARCH
+	reset_search();
+#endif
+}
+
+
+// Perform the onewire reset function.  We will wait up to 250uS for
+// the bus to come high, if it doesn't then it is broken or shorted
+// and we return a 0;
+//
+// Returns 1 if a device asserted a presence pulse, 0 otherwise.
+//
+uint8_t OneWire::reset(void)
+{
+	IO_REG_TYPE mask = bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_ASM = baseReg;
+	uint8_t r;
+	uint8_t retries = 125;
+
+	noInterrupts();
+	DIRECT_MODE_INPUT(reg, mask);
+	interrupts();
+	// wait until the wire is high... just in case
+	do {
+		if (--retries == 0) return 0;
+		delayMicroseconds(2);
+	} while ( !DIRECT_READ(reg, mask));
+
+	noInterrupts();
+	DIRECT_WRITE_LOW(reg, mask);
+	DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+	interrupts();
+	delayMicroseconds(480);
+	noInterrupts();
+	DIRECT_MODE_INPUT(reg, mask);	// allow it to float
+	delayMicroseconds(70);
+	r = !DIRECT_READ(reg, mask);
+	interrupts();
+	delayMicroseconds(410);
+	return r;
+}
+
+//
+// Write a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+void OneWire::write_bit(uint8_t v)
+{
+	IO_REG_TYPE mask=bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_ASM = baseReg;
+
+	if (v & 1) {
+		noInterrupts();
+		DIRECT_WRITE_LOW(reg, mask);
+		DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+		delayMicroseconds(10);
+		DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+		interrupts();
+		delayMicroseconds(55);
+	} else {
+		noInterrupts();
+		DIRECT_WRITE_LOW(reg, mask);
+		DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+		delayMicroseconds(65);
+		DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+		interrupts();
+		delayMicroseconds(5);
+	}
+}
+
+//
+// Read a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+uint8_t OneWire::read_bit(void)
+{
+	IO_REG_TYPE mask=bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_ASM = baseReg;
+	uint8_t r;
+
+	noInterrupts();
+	DIRECT_MODE_OUTPUT(reg, mask);
+	DIRECT_WRITE_LOW(reg, mask);
+	delayMicroseconds(3);
+	DIRECT_MODE_INPUT(reg, mask);	// let pin float, pull up will raise
+	delayMicroseconds(10);
+	r = DIRECT_READ(reg, mask);
+	interrupts();
+	delayMicroseconds(53);
+	return r;
+}
+
+//
+// Write a byte. The writing code uses the active drivers to raise the
+// pin high, if you need power after the write (e.g. DS18S20 in
+// parasite power mode) then set 'power' to 1, otherwise the pin will
+// go tri-state at the end of the write to avoid heating in a short or
+// other mishap.
+//
+void OneWire::write(uint8_t v, uint8_t power /* = 0 */) {
+    uint8_t bitMask;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+	OneWire::write_bit( (bitMask & v)?1:0);
+    }
+    if ( !power) {
+	noInterrupts();
+	DIRECT_MODE_INPUT(baseReg, bitmask);
+	DIRECT_WRITE_LOW(baseReg, bitmask);
+	interrupts();
+    }
+}
+
+void OneWire::write_bytes(const uint8_t *buf, uint16_t count, bool power /* = 0 */) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    write(buf[i]);
+  if (!power) {
+    noInterrupts();
+    DIRECT_MODE_INPUT(baseReg, bitmask);
+    DIRECT_WRITE_LOW(baseReg, bitmask);
+    interrupts();
+  }
+}
+
+//
+// Read a byte
+//
+uint8_t OneWire::read() {
+    uint8_t bitMask;
+    uint8_t r = 0;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+	if ( OneWire::read_bit()) r |= bitMask;
+    }
+    return r;
+}
+
+void OneWire::read_bytes(uint8_t *buf, uint16_t count) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    buf[i] = read();
+}
+
+//
+// Do a ROM select
+//
+void OneWire::select(const uint8_t rom[8])
+{
+    uint8_t i;
+
+    write(0x55);           // Choose ROM
+
+    for (i = 0; i < 8; i++) write(rom[i]);
+}
+
+//
+// Do a ROM skip
+//
+void OneWire::skip()
+{
+    write(0xCC);           // Skip ROM
+}
+
+void OneWire::depower()
+{
+	noInterrupts();
+	DIRECT_MODE_INPUT(baseReg, bitmask);
+	interrupts();
+}
+
+#if ONEWIRE_SEARCH
+
+//
+// You need to use this function to start a search again from the beginning.
+// You do not need to do it for the first search, though you could.
+//
+void OneWire::reset_search()
+{
+  // reset the search state
+  LastDiscrepancy = 0;
+  LastDeviceFlag = FALSE;
+  LastFamilyDiscrepancy = 0;
+  for(int i = 7; ; i--) {
+    ROM_NO[i] = 0;
+    if ( i == 0) break;
+  }
+}
+
+// Setup the search to find the device type 'family_code' on the next call
+// to search(*newAddr) if it is present.
+//
+void OneWire::target_search(uint8_t family_code)
+{
+   // set the search state to find SearchFamily type devices
+   ROM_NO[0] = family_code;
+   for (uint8_t i = 1; i < 8; i++)
+      ROM_NO[i] = 0;
+   LastDiscrepancy = 64;
+   LastFamilyDiscrepancy = 0;
+   LastDeviceFlag = FALSE;
+}
+
+//
+// Perform a search. If this function returns a '1' then it has
+// enumerated the next device and you may retrieve the ROM from the
+// OneWire::address variable. If there are no devices, no further
+// devices, or something horrible happens in the middle of the
+// enumeration then a 0 is returned.  If a new device is found then
+// its address is copied to newAddr.  Use OneWire::reset_search() to
+// start over.
+//
+// --- Replaced by the one from the Dallas Semiconductor web site ---
+//--------------------------------------------------------------------------
+// Perform the 1-Wire Search Algorithm on the 1-Wire bus using the existing
+// search state.
+// Return TRUE  : device found, ROM number in ROM_NO buffer
+//        FALSE : device not found, end of search
+//
+uint8_t OneWire::search(uint8_t *newAddr)
+{
+   uint8_t id_bit_number;
+   uint8_t last_zero, rom_byte_number, search_result;
+   uint8_t id_bit, cmp_id_bit;
+
+   unsigned char rom_byte_mask, search_direction;
+
+   // initialize for search
+   id_bit_number = 1;
+   last_zero = 0;
+   rom_byte_number = 0;
+   rom_byte_mask = 1;
+   search_result = 0;
+
+   // if the last call was not the last one
+   if (!LastDeviceFlag)
+   {
+      // 1-Wire reset
+      if (!reset())
+      {
+         // reset the search
+         LastDiscrepancy = 0;
+         LastDeviceFlag = FALSE;
+         LastFamilyDiscrepancy = 0;
+         return FALSE;
+      }
+
+      // issue the search command
+      write(0xF0);
+
+      // loop to do the search
+      do
+      {
+         // read a bit and its complement
+         id_bit = read_bit();
+         cmp_id_bit = read_bit();
+
+         // check for no devices on 1-wire
+         if ((id_bit == 1) && (cmp_id_bit == 1))
+            break;
+         else
+         {
+            // all devices coupled have 0 or 1
+            if (id_bit != cmp_id_bit)
+               search_direction = id_bit;  // bit write value for search
+            else
+            {
+               // if this discrepancy if before the Last Discrepancy
+               // on a previous next then pick the same as last time
+               if (id_bit_number < LastDiscrepancy)
+                  search_direction = ((ROM_NO[rom_byte_number] & rom_byte_mask) > 0);
+               else
+                  // if equal to last pick 1, if not then pick 0
+                  search_direction = (id_bit_number == LastDiscrepancy);
+
+               // if 0 was picked then record its position in LastZero
+               if (search_direction == 0)
+               {
+                  last_zero = id_bit_number;
+
+                  // check for Last discrepancy in family
+                  if (last_zero < 9)
+                     LastFamilyDiscrepancy = last_zero;
+               }
+            }
+
+            // set or clear the bit in the ROM byte rom_byte_number
+            // with mask rom_byte_mask
+            if (search_direction == 1)
+              ROM_NO[rom_byte_number] |= rom_byte_mask;
+            else
+              ROM_NO[rom_byte_number] &= ~rom_byte_mask;
+
+            // serial number search direction write bit
+            write_bit(search_direction);
+
+            // increment the byte counter id_bit_number
+            // and shift the mask rom_byte_mask
+            id_bit_number++;
+            rom_byte_mask <<= 1;
+
+            // if the mask is 0 then go to new SerialNum byte rom_byte_number and reset mask
+            if (rom_byte_mask == 0)
+            {
+                rom_byte_number++;
+                rom_byte_mask = 1;
+            }
+         }
+      }
+      while(rom_byte_number < 8);  // loop until through all ROM bytes 0-7
+
+      // if the search was successful then
+      if (!(id_bit_number < 65))
+      {
+         // search successful so set LastDiscrepancy,LastDeviceFlag,search_result
+         LastDiscrepancy = last_zero;
+
+         // check for last device
+         if (LastDiscrepancy == 0)
+            LastDeviceFlag = TRUE;
+
+         search_result = TRUE;
+      }
+   }
+
+   // if no device found then reset counters so next 'search' will be like a first
+   if (!search_result || !ROM_NO[0])
+   {
+      LastDiscrepancy = 0;
+      LastDeviceFlag = FALSE;
+      LastFamilyDiscrepancy = 0;
+      search_result = FALSE;
+   }
+   for (int i = 0; i < 8; i++) newAddr[i] = ROM_NO[i];
+   return search_result;
+  }
+
+#endif
+
+#if ONEWIRE_CRC
+// The 1-Wire CRC scheme is described in Maxim Application Note 27:
+// "Understanding and Using Cyclic Redundancy Checks with Maxim iButton Products"
+//
+
+#if ONEWIRE_CRC8_TABLE
+// This table comes from Dallas sample code where it is freely reusable,
+// though Copyright (C) 2000 Dallas Semiconductor Corporation
+static const uint8_t PROGMEM dscrc_table[] = {
+      0, 94,188,226, 97, 63,221,131,194,156,126, 32,163,253, 31, 65,
+    157,195, 33,127,252,162, 64, 30, 95,  1,227,189, 62, 96,130,220,
+     35,125,159,193, 66, 28,254,160,225,191, 93,  3,128,222, 60, 98,
+    190,224,  2, 92,223,129, 99, 61,124, 34,192,158, 29, 67,161,255,
+     70, 24,250,164, 39,121,155,197,132,218, 56,102,229,187, 89,  7,
+    219,133,103, 57,186,228,  6, 88, 25, 71,165,251,120, 38,196,154,
+    101, 59,217,135,  4, 90,184,230,167,249, 27, 69,198,152,122, 36,
+    248,166, 68, 26,153,199, 37,123, 58,100,134,216, 91,  5,231,185,
+    140,210, 48,110,237,179, 81, 15, 78, 16,242,172, 47,113,147,205,
+     17, 79,173,243,112, 46,204,146,211,141,111, 49,178,236, 14, 80,
+    175,241, 19, 77,206,144,114, 44,109, 51,209,143, 12, 82,176,238,
+     50,108,142,208, 83, 13,239,177,240,174, 76, 18,145,207, 45,115,
+    202,148,118, 40,171,245, 23, 73,  8, 86,180,234,105, 55,213,139,
+     87,  9,235,181, 54,104,138,212,149,203, 41,119,244,170, 72, 22,
+    233,183, 85, 11,136,214, 52,106, 43,117,151,201, 74, 20,246,168,
+    116, 42,200,150, 21, 75,169,247,182,232, 10, 84,215,137,107, 53};
+
+//
+// Compute a Dallas Semiconductor 8 bit CRC. These show up in the ROM
+// and the registers.  (note: this might better be done without to
+// table, it would probably be smaller and certainly fast enough
+// compared to all those delayMicrosecond() calls.  But I got
+// confused, so I use this table from the examples.)
+//
+uint8_t OneWire::crc8(const uint8_t *addr, uint8_t len)
+{
+	uint8_t crc = 0;
+
+	while (len--) {
+		crc = pgm_read_byte(dscrc_table + (crc ^ *addr++));
+	}
+	return crc;
+}
+#else
+//
+// Compute a Dallas Semiconductor 8 bit CRC directly.
+// this is much slower, but much smaller, than the lookup table.
+//
+uint8_t OneWire::crc8(const uint8_t *addr, uint8_t len)
+{
+	uint8_t crc = 0;
+	
+	while (len--) {
+		uint8_t inbyte = *addr++;
+		for (uint8_t i = 8; i; i--) {
+			uint8_t mix = (crc ^ inbyte) & 0x01;
+			crc >>= 1;
+			if (mix) crc ^= 0x8C;
+			inbyte >>= 1;
+		}
+	}
+	return crc;
+}
+#endif
+
+#if ONEWIRE_CRC16
+bool OneWire::check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc)
+{
+    crc = ~crc16(input, len, crc);
+    return (crc & 0xFF) == inverted_crc[0] && (crc >> 8) == inverted_crc[1];
+}
+
+uint16_t OneWire::crc16(const uint8_t* input, uint16_t len, uint16_t crc)
+{
+    static const uint8_t oddparity[16] =
+        { 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0 };
+
+    for (uint16_t i = 0 ; i < len ; i++) {
+      // Even though we're just copying a byte from the input,
+      // we'll be doing 16-bit computation with it.
+      uint16_t cdata = input[i];
+      cdata = (cdata ^ crc) & 0xff;
+      crc >>= 8;
+
+      if (oddparity[cdata & 0x0F] ^ oddparity[cdata >> 4])
+          crc ^= 0xC001;
+
+      cdata <<= 6;
+      crc ^= cdata;
+      cdata <<= 1;
+      crc ^= cdata;
+    }
+    return crc;
+}
+#endif
+
+#endif
diff --git a/libraries/MAX31850_OneWire/OneWire.h b/libraries/MAX31850_OneWire/OneWire.h
new file mode 100644
index 0000000..916c529
--- /dev/null
+++ b/libraries/MAX31850_OneWire/OneWire.h
@@ -0,0 +1,229 @@
+#ifndef OneWire_h
+#define OneWire_h
+
+#include <inttypes.h>
+
+#if ARDUINO >= 100
+#include "Arduino.h"       // for delayMicroseconds, digitalPinToBitMask, etc
+#else
+#include "WProgram.h"      // for delayMicroseconds
+#include "pins_arduino.h"  // for digitalPinToBitMask, etc
+#endif
+
+// You can exclude certain features from OneWire.  In theory, this
+// might save some space.  In practice, the compiler automatically
+// removes unused code (technically, the linker, using -fdata-sections
+// and -ffunction-sections when compiling, and Wl,--gc-sections
+// when linking), so most of these will not result in any code size
+// reduction.  Well, unless you try to use the missing features
+// and redesign your program to not need them!  ONEWIRE_CRC8_TABLE
+// is the exception, because it selects a fast but large algorithm
+// or a small but slow algorithm.
+
+// you can exclude onewire_search by defining that to 0
+#ifndef ONEWIRE_SEARCH
+#define ONEWIRE_SEARCH 1
+#endif
+
+// You can exclude CRC checks altogether by defining this to 0
+#ifndef ONEWIRE_CRC
+#define ONEWIRE_CRC 1
+#endif
+
+// Select the table-lookup method of computing the 8-bit CRC
+// by setting this to 1.  The lookup table enlarges code size by
+// about 250 bytes.  It does NOT consume RAM (but did in very
+// old versions of OneWire).  If you disable this, a slower
+// but very compact algorithm is used.
+#ifndef ONEWIRE_CRC8_TABLE
+#define ONEWIRE_CRC8_TABLE 1
+#endif
+
+// You can allow 16-bit CRC checks by defining this to 1
+// (Note that ONEWIRE_CRC must also be 1.)
+#ifndef ONEWIRE_CRC16
+#define ONEWIRE_CRC16 1
+#endif
+
+#define FALSE 0
+#define TRUE  1
+
+// Platform specific I/O definitions
+
+#if defined(__AVR__)
+#define PIN_TO_BASEREG(pin)             (portInputRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint8_t
+#define IO_REG_ASM asm("r30")
+#define DIRECT_READ(base, mask)         (((*(base)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+1)) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+1)) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+2)) &= ~(mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+2)) |= (mask))
+
+#elif defined(__MK20DX128__)
+#define PIN_TO_BASEREG(pin)             (portOutputRegister(pin))
+#define PIN_TO_BITMASK(pin)             (1)
+#define IO_REG_TYPE uint8_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (*((base)+512))
+#define DIRECT_MODE_INPUT(base, mask)   (*((base)+640) = 0)
+#define DIRECT_MODE_OUTPUT(base, mask)  (*((base)+640) = 1)
+#define DIRECT_WRITE_LOW(base, mask)    (*((base)+256) = 1)
+#define DIRECT_WRITE_HIGH(base, mask)   (*((base)+128) = 1)
+
+#elif defined(__SAM3X8E__)
+// Arduino 1.5.1 may have a bug in delayMicroseconds() on Arduino Due.
+// http://arduino.cc/forum/index.php/topic,141030.msg1076268.html#msg1076268
+// If you have trouble with OneWire on Arduino Due, please check the
+// status of delayMicroseconds() before reporting a bug in OneWire!
+#define PIN_TO_BASEREG(pin)             (&(digitalPinToPort(pin)->PIO_PER))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (((*((base)+15)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+5)) = (mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+4)) = (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+13)) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+12)) = (mask))
+#ifndef PROGMEM
+#define PROGMEM
+#endif
+#ifndef pgm_read_byte
+#define pgm_read_byte(addr) (*(const uint8_t *)(addr))
+#endif
+
+#elif defined(__PIC32MX__)
+#define PIN_TO_BASEREG(pin)             (portModeRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (((*(base+4)) & (mask)) ? 1 : 0)  //PORTX + 0x10
+#define DIRECT_MODE_INPUT(base, mask)   ((*(base+2)) = (mask))            //TRISXSET + 0x08
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*(base+1)) = (mask))            //TRISXCLR + 0x04
+#define DIRECT_WRITE_LOW(base, mask)    ((*(base+8+1)) = (mask))          //LATXCLR  + 0x24
+#define DIRECT_WRITE_HIGH(base, mask)   ((*(base+8+2)) = (mask))          //LATXSET + 0x28
+
+#else
+#error "Please define I/O register types here"
+#endif
+
+
+class OneWire
+{
+  private:
+    IO_REG_TYPE bitmask;
+    volatile IO_REG_TYPE *baseReg;
+
+#if ONEWIRE_SEARCH
+    // global search state
+    unsigned char ROM_NO[8];
+    uint8_t LastDiscrepancy;
+    uint8_t LastFamilyDiscrepancy;
+    uint8_t LastDeviceFlag;
+#endif
+
+  public:
+    OneWire( uint8_t pin);
+
+    // Perform a 1-Wire reset cycle. Returns 1 if a device responds
+    // with a presence pulse.  Returns 0 if there is no device or the
+    // bus is shorted or otherwise held low for more than 250uS
+    uint8_t reset(void);
+
+    // Issue a 1-Wire rom select command, you do the reset first.
+    void select(const uint8_t rom[8]);
+
+    // Issue a 1-Wire rom skip command, to address all on bus.
+    void skip(void);
+
+    // Write a byte. If 'power' is one then the wire is held high at
+    // the end for parasitically powered devices. You are responsible
+    // for eventually depowering it by calling depower() or doing
+    // another read or write.
+    void write(uint8_t v, uint8_t power = 0);
+
+    void write_bytes(const uint8_t *buf, uint16_t count, bool power = 0);
+
+    // Read a byte.
+    uint8_t read(void);
+
+    void read_bytes(uint8_t *buf, uint16_t count);
+
+    // Write a bit. The bus is always left powered at the end, see
+    // note in write() about that.
+    void write_bit(uint8_t v);
+
+    // Read a bit.
+    uint8_t read_bit(void);
+
+    // Stop forcing power onto the bus. You only need to do this if
+    // you used the 'power' flag to write() or used a write_bit() call
+    // and aren't about to do another read or write. You would rather
+    // not leave this powered if you don't have to, just in case
+    // someone shorts your bus.
+    void depower(void);
+
+#if ONEWIRE_SEARCH
+    // Clear the search state so that if will start from the beginning again.
+    void reset_search();
+
+    // Setup the search to find the device type 'family_code' on the next call
+    // to search(*newAddr) if it is present.
+    void target_search(uint8_t family_code);
+
+    // Look for the next device. Returns 1 if a new address has been
+    // returned. A zero might mean that the bus is shorted, there are
+    // no devices, or you have already retrieved all of them.  It
+    // might be a good idea to check the CRC to make sure you didn't
+    // get garbage.  The order is deterministic. You will always get
+    // the same devices in the same order.
+    uint8_t search(uint8_t *newAddr);
+#endif
+
+#if ONEWIRE_CRC
+    // Compute a Dallas Semiconductor 8 bit CRC, these are used in the
+    // ROM and scratchpad registers.
+    static uint8_t crc8(const uint8_t *addr, uint8_t len);
+
+#if ONEWIRE_CRC16
+    // Compute the 1-Wire CRC16 and compare it against the received CRC.
+    // Example usage (reading a DS2408):
+    //    // Put everything in a buffer so we can compute the CRC easily.
+    //    uint8_t buf[13];
+    //    buf[0] = 0xF0;    // Read PIO Registers
+    //    buf[1] = 0x88;    // LSB address
+    //    buf[2] = 0x00;    // MSB address
+    //    WriteBytes(net, buf, 3);    // Write 3 cmd bytes
+    //    ReadBytes(net, buf+3, 10);  // Read 6 data bytes, 2 0xFF, 2 CRC16
+    //    if (!CheckCRC16(buf, 11, &buf[11])) {
+    //        // Handle error.
+    //    }     
+    //          
+    // @param input - Array of bytes to checksum.
+    // @param len - How many bytes to use.
+    // @param inverted_crc - The two CRC16 bytes in the received data.
+    //                       This should just point into the received data,
+    //                       *not* at a 16-bit integer.
+    // @param crc - The crc starting value (optional)
+    // @return True, iff the CRC matches.
+    static bool check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc = 0);
+
+    // Compute a Dallas Semiconductor 16 bit CRC.  This is required to check
+    // the integrity of data received from many 1-Wire devices.  Note that the
+    // CRC computed here is *not* what you'll get from the 1-Wire network,
+    // for two reasons:
+    //   1) The CRC is transmitted bitwise inverted.
+    //   2) Depending on the endian-ness of your processor, the binary
+    //      representation of the two-byte return value may have a different
+    //      byte order than the two bytes you get from 1-Wire.
+    // @param input - Array of bytes to checksum.
+    // @param len - How many bytes to use.
+    // @param crc - The crc starting value (optional)
+    // @return The CRC16, as defined by Dallas Semiconductor.
+    static uint16_t crc16(const uint8_t* input, uint16_t len, uint16_t crc = 0);
+#endif
+#endif
+};
+
+#endif
diff --git a/libraries/MAX31850_OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde b/libraries/MAX31850_OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde
new file mode 100644
index 0000000..68ca194
--- /dev/null
+++ b/libraries/MAX31850_OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde
@@ -0,0 +1,112 @@
+#include <OneWire.h>
+
+// OneWire DS18S20, DS18B20, DS1822 Temperature Example
+//
+// http://www.pjrc.com/teensy/td_libs_OneWire.html
+//
+// The DallasTemperature library can do all this work for you!
+// http://milesburton.com/Dallas_Temperature_Control_Library
+
+OneWire  ds(10);  // on pin 10 (a 4.7K resistor is necessary)
+
+void setup(void) {
+  Serial.begin(9600);
+}
+
+void loop(void) {
+  byte i;
+  byte present = 0;
+  byte type_s;
+  byte data[12];
+  byte addr[8];
+  float celsius, fahrenheit;
+  
+  if ( !ds.search(addr)) {
+    Serial.println("No more addresses.");
+    Serial.println();
+    ds.reset_search();
+    delay(250);
+    return;
+  }
+  
+  Serial.print("ROM =");
+  for( i = 0; i < 8; i++) {
+    Serial.write(' ');
+    Serial.print(addr[i], HEX);
+  }
+
+  if (OneWire::crc8(addr, 7) != addr[7]) {
+      Serial.println("CRC is not valid!");
+      return;
+  }
+  Serial.println();
+ 
+  // the first ROM byte indicates which chip
+  switch (addr[0]) {
+    case 0x10:
+      Serial.println("  Chip = DS18S20");  // or old DS1820
+      type_s = 1;
+      break;
+    case 0x28:
+      Serial.println("  Chip = DS18B20");
+      type_s = 0;
+      break;
+    case 0x22:
+      Serial.println("  Chip = DS1822");
+      type_s = 0;
+      break;
+    default:
+      Serial.println("Device is not a DS18x20 family device.");
+      return;
+  } 
+
+  ds.reset();
+  ds.select(addr);
+  ds.write(0x44, 1);        // start conversion, with parasite power on at the end
+  
+  delay(1000);     // maybe 750ms is enough, maybe not
+  // we might do a ds.depower() here, but the reset will take care of it.
+  
+  present = ds.reset();
+  ds.select(addr);    
+  ds.write(0xBE);         // Read Scratchpad
+
+  Serial.print("  Data = ");
+  Serial.print(present, HEX);
+  Serial.print(" ");
+  for ( i = 0; i < 9; i++) {           // we need 9 bytes
+    data[i] = ds.read();
+    Serial.print(data[i], HEX);
+    Serial.print(" ");
+  }
+  Serial.print(" CRC=");
+  Serial.print(OneWire::crc8(data, 8), HEX);
+  Serial.println();
+
+  // Convert the data to actual temperature
+  // because the result is a 16 bit signed integer, it should
+  // be stored to an "int16_t" type, which is always 16 bits
+  // even when compiled on a 32 bit processor.
+  int16_t raw = (data[1] << 8) | data[0];
+  if (type_s) {
+    raw = raw << 3; // 9 bit resolution default
+    if (data[7] == 0x10) {
+      // "count remain" gives full 12 bit resolution
+      raw = (raw & 0xFFF0) + 12 - data[6];
+    }
+  } else {
+    byte cfg = (data[4] & 0x60);
+    // at lower res, the low bits are undefined, so let's zero them
+    if (cfg == 0x00) raw = raw & ~7;  // 9 bit resolution, 93.75 ms
+    else if (cfg == 0x20) raw = raw & ~3; // 10 bit res, 187.5 ms
+    else if (cfg == 0x40) raw = raw & ~1; // 11 bit res, 375 ms
+    //// default is 12 bit resolution, 750 ms conversion time
+  }
+  celsius = (float)raw / 16.0;
+  fahrenheit = celsius * 1.8 + 32.0;
+  Serial.print("  Temperature = ");
+  Serial.print(celsius);
+  Serial.print(" Celsius, ");
+  Serial.print(fahrenheit);
+  Serial.println(" Fahrenheit");
+}
diff --git a/libraries/MAX31850_OneWire/examples/DS2408_Switch/DS2408_Switch.pde b/libraries/MAX31850_OneWire/examples/DS2408_Switch/DS2408_Switch.pde
new file mode 100644
index 0000000..d171f9b
--- /dev/null
+++ b/libraries/MAX31850_OneWire/examples/DS2408_Switch/DS2408_Switch.pde
@@ -0,0 +1,77 @@
+#include <OneWire.h>
+
+/*
+ * DS2408 8-Channel Addressable Switch
+ *
+ * Writte by Glenn Trewitt, glenn at trewitt dot org
+ *
+ * Some notes about the DS2408:
+ *   - Unlike most input/output ports, the DS2408 doesn't have mode bits to
+ *       set whether the pins are input or output.  If you issue a read command,
+ *       they're inputs.  If you write to them, they're outputs.
+ *   - For reading from a switch, you should use 10K pull-up resisters.
+ */
+
+void PrintBytes(uint8_t* addr, uint8_t count, bool newline=0) {
+  for (uint8_t i = 0; i < count; i++) {
+    Serial.print(addr[i]>>4, HEX);
+    Serial.print(addr[i]&0x0f, HEX);
+  }
+  if (newline)
+    Serial.println();
+}
+
+void ReadAndReport(OneWire* net, uint8_t* addr) {
+  Serial.print("  Reading DS2408 ");
+  PrintBytes(addr, 8);
+  Serial.println();
+	
+  uint8_t buf[13];  // Put everything in the buffer so we can compute CRC easily.
+  buf[0] = 0xF0;    // Read PIO Registers
+  buf[1] = 0x88;    // LSB address
+  buf[2] = 0x00;    // MSB address
+  net->write_bytes(buf, 3);
+  net->read_bytes(buf+3, 10);     // 3 cmd bytes, 6 data bytes, 2 0xFF, 2 CRC16
+  net->reset();
+
+  if (!OneWire::check_crc16(buf, 11, &buf[11])) {
+    Serial.print("CRC failure in DS2408 at ");
+    PrintBytes(addr, 8, true);
+    return;
+  }
+  Serial.print("  DS2408 data = ");
+  // First 3 bytes contain command, register address.
+  Serial.println(buf[3], BIN);
+}
+
+OneWire net(10);  // on pin 10
+
+void setup(void) {
+  Serial.begin(9600);
+}
+
+void loop(void) {
+  byte i;
+  byte present = 0;
+  byte addr[8];
+  
+  if (!net.search(addr)) {
+    Serial.print("No more addresses.\n");
+    net.reset_search();
+    delay(1000);
+    return;
+  }
+  
+  if (OneWire::crc8(addr, 7) != addr[7]) {
+    Serial.print("CRC is not valid!\n");
+    return;
+  }
+  
+  if (addr[0] != 0x29) {
+    PrintBytes(addr, 8);
+    Serial.print(" is not a DS2408.\n");
+    return;
+  }
+
+  ReadAndReport(&net, addr);
+}
diff --git a/libraries/MAX31850_OneWire/examples/DS250x_PROM/DS250x_PROM.pde b/libraries/MAX31850_OneWire/examples/DS250x_PROM/DS250x_PROM.pde
new file mode 100644
index 0000000..a85b1c2
--- /dev/null
+++ b/libraries/MAX31850_OneWire/examples/DS250x_PROM/DS250x_PROM.pde
@@ -0,0 +1,90 @@
+/*
+DS250x add-only programmable memory reader w/SKIP ROM.
+ 
+ The DS250x is a 512/1024bit add-only PROM(you can add data but cannot change the old one) that's used mainly for device identification purposes
+ like serial number, mfgr data, unique identifiers, etc. It uses the Maxim 1-wire bus.
+ 
+ This sketch will use the SKIP ROM function that skips the 1-Wire search phase since we only have one device connected in the bus on digital pin 6.
+ If more than one device is connected to the bus, it will fail.
+ Sketch will not verify if device connected is from the DS250x family since the skip rom function effectively skips the family-id byte readout.
+ thus it is possible to run this sketch with any Maxim OneWire device in which case the command CRC will most likely fail.
+ Sketch will only read the first page of memory(32bits) starting from the lower address(0000h), if more than 1 device is present, then use the sketch with search functions.
+ Remember to put a 4.7K pullup resistor between pin 6 and +Vcc
+ 
+ To change the range or ammount of data to read, simply change the data array size, LSB/MSB addresses and for loop iterations
+ 
+ This example code is in the public domain and is provided AS-IS.
+ 
+ Built with Arduino 0022 and PJRC OneWire 2.0 library http://www.pjrc.com/teensy/td_libs_OneWire.html
+ 
+ created by Guillermo Lovato <glovato@gmail.com>
+ march/2011
+ 
+ */
+
+#include <OneWire.h>
+OneWire ds(6);                    // OneWire bus on digital pin 6
+void setup() {
+  Serial.begin (9600);
+}
+
+void loop() {
+  byte i;                         // This is for the for loops
+  boolean present;                // device present var
+  byte data[32];                  // container for the data from device
+  byte leemem[3] = {              // array with the commands to initiate a read, DS250x devices expect 3 bytes to start a read: command,LSB&MSB adresses
+    0xF0 , 0x00 , 0x00   };       // 0xF0 is the Read Data command, followed by 00h 00h as starting address(the beginning, 0000h)
+  byte ccrc;                      // Variable to store the command CRC
+  byte ccrc_calc;
+
+  present = ds.reset();           // OneWire bus reset, always needed to start operation on the bus, returns a 1/TRUE if there's a device present.
+  ds.skip();                      // Skip ROM search
+
+  if (present == TRUE){           // We only try to read the data if there's a device present 
+    Serial.println("DS250x device present");
+    ds.write(leemem[0],1);        // Read data command, leave ghost power on
+    ds.write(leemem[1],1);        // LSB starting address, leave ghost power on
+    ds.write(leemem[2],1);        // MSB starting address, leave ghost power on
+
+    ccrc = ds.read();             // DS250x generates a CRC for the command we sent, we assign a read slot and store it's value
+    ccrc_calc = OneWire::crc8(leemem, 3);  // We calculate the CRC of the commands we sent using the library function and store it
+
+    if ( ccrc_calc != ccrc) {      // Then we compare it to the value the ds250x calculated, if it fails, we print debug messages and abort
+      Serial.println("Invalid command CRC!");
+      Serial.print("Calculated CRC:");
+      Serial.println(ccrc_calc,HEX);    // HEX makes it easier to observe and compare
+      Serial.print("DS250x readback CRC:");
+      Serial.println(ccrc,HEX);
+      return;                      // Since CRC failed, we abort the rest of the loop and start over
+    }
+    Serial.println("Data is: ");   // For the printout of the data 
+    for ( i = 0; i < 32; i++) {    // Now it's time to read the PROM data itself, each page is 32 bytes so we need 32 read commands
+      data[i] = ds.read();         // we store each read byte to a different position in the data array 
+      Serial.print(data[i]);       // printout in ASCII
+      Serial.print(" ");           // blank space 
+    }
+    Serial.println();
+    delay(5000);                    // Delay so we don't saturate the serial output
+  }
+  else {                           // Nothing is connected in the bus 
+    Serial.println("Nothing connected");
+    delay(3000);
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libraries/MAX31850_OneWire/examples/MAX31850_Temperature/MAX31850_Temperature.ino b/libraries/MAX31850_OneWire/examples/MAX31850_Temperature/MAX31850_Temperature.ino
new file mode 100644
index 0000000..b9b6831
--- /dev/null
+++ b/libraries/MAX31850_OneWire/examples/MAX31850_Temperature/MAX31850_Temperature.ino
@@ -0,0 +1,127 @@
+#include <OneWire.h>
+
+// OneWire MAX31850 or DS18B20 example!
+// Connect either/both kinds of sensors, it will automatically detect
+// the type and decode properly
+
+#define TYPE_DS18S20 0
+#define TYPE_DS18B20 1
+#define TYPE_DS18S22 2
+#define TYPE_MAX31850 3
+OneWire  ds(10);  // on pin 10 (a 4.7K pullup resistor is necessary)
+
+void setup(void) {
+  Serial.begin(9600);
+}
+
+void loop(void) {
+  byte i;
+  byte present = 0;
+  byte temptype;
+  byte data[12];
+  byte addr[8];
+  float celsius, fahrenheit;
+  
+  Serial.println(F("******************************************"));
+  if ( !ds.search(addr)) {
+    Serial.println();
+    Serial.println("No more addresses.");
+    Serial.println();
+    ds.reset_search();
+    delay(250);
+    return;
+  }
+  Serial.print("ROM =");
+  for( i = 0; i < 8; i++) {
+    Serial.write(' ');
+    Serial.print(addr[i], HEX);
+  }
+
+  if (OneWire::crc8(addr, 7) != addr[7]) {
+      Serial.println("CRC is not valid!");
+      return;
+  }
+  Serial.println();
+ 
+  // the first ROM byte indicates which chip
+  switch (addr[0]) {
+    case 0x10:
+      Serial.println("  Chip = DS18S20");  // or old DS1820
+      temptype = TYPE_DS18S20;
+      break;
+    case 0x28:
+      Serial.println("  Chip = DS18B20");
+      temptype = TYPE_DS18B20;
+      break;
+    case 0x22:
+      Serial.println("  Chip = DS1822");
+      temptype = TYPE_DS18S22;
+      break;
+      // ADDED SUPPORT FOR MAX31850!
+    case 0x3B:
+      Serial.println("  Chip = MAX31850");
+      temptype = TYPE_MAX31850;
+      break;
+    default:
+      Serial.println("Device is not a DS18x20 family device.");
+      return;
+  } 
+
+  ds.reset();
+  ds.select(addr);
+  ds.write(0x44, 1);        // start conversion, with parasite power on at the end
+  
+  delay(1000);     // maybe 750ms is enough, maybe not
+  // we might do a ds.depower() here, but the reset will take care of it.
+  
+  present = ds.reset();
+  ds.select(addr);    
+  ds.write(0xBE);         // Read Scratchpad
+
+  Serial.print("  Data = ");
+  Serial.print(present, HEX);
+  Serial.print(" ");
+  for ( i = 0; i < 9; i++) {           // we need 9 bytes
+    data[i] = ds.read();
+    Serial.print(data[i], HEX);
+    Serial.print(" ");
+  }
+  Serial.print(" CRC=");
+  Serial.print(OneWire::crc8(data, 8), HEX);
+  Serial.println();
+
+  Serial.print("  Address = 0x"); Serial.println(data[4] & 0xF, HEX);
+
+  // Convert the data to actual temperature
+  // because the result is a 16 bit signed integer, it should
+  // be stored to an "int16_t" type, which is always 16 bits
+  // even when compiled on a 32 bit processor.
+  int16_t raw = (data[1] << 8) | data[0];
+  if (temptype == TYPE_DS18S20) {
+    raw = raw << 3; // 9 bit resolution default
+    if (data[7] == 0x10) {
+      // "count remain" gives full 12 bit resolution
+      raw = (raw & 0xFFF0) + 12 - data[6];
+    }
+  } else if (temptype == TYPE_MAX31850) {
+    //Serial.println(raw, HEX);
+    if (raw & 0x01) {
+      Serial.println("**FAULT!**");
+      return;
+    }
+  } else {
+    byte cfg = (data[4] & 0x60);
+    // at lower res, the low bits are undefined, so let's zero them
+    if (cfg == 0x00) raw = raw & ~7;  // 9 bit resolution, 93.75 ms
+    else if (cfg == 0x20) raw = raw & ~3; // 10 bit res, 187.5 ms
+    else if (cfg == 0x40) raw = raw & ~1; // 11 bit res, 375 ms
+    //// default is 12 bit resolution, 750 ms conversion time
+  }
+  celsius = (float)raw / 16.0;
+  fahrenheit = celsius * 1.8 + 32.0;
+  Serial.print("  Temperature = ");
+  Serial.print(celsius);
+  Serial.print(" Celsius, ");
+  Serial.print(fahrenheit);
+  Serial.println(" Fahrenheit");
+}
\ No newline at end of file
diff --git a/libraries/MAX31850_OneWire/examples/MAX31850_sample/MAX31850_sample.ino b/libraries/MAX31850_OneWire/examples/MAX31850_sample/MAX31850_sample.ino
new file mode 100644
index 0000000..4e91bbf
--- /dev/null
+++ b/libraries/MAX31850_OneWire/examples/MAX31850_sample/MAX31850_sample.ino
@@ -0,0 +1,64 @@
+#include <OneWire.h>
+
+/* MAX31850 Temperature chip i/o */
+
+OneWire  ds(10);  // on pin 10
+
+void setup(void) {
+  Serial.begin(9600);
+}
+
+void loop(void) {
+  byte i;
+  byte present = 0;
+  byte data[12];
+  byte addr[8];
+  
+  if ( !ds.search(addr)) {
+    Serial.print("No more addresses.\n");
+    ds.reset_search();
+    delay(250);
+    return;
+  }
+  
+  Serial.print("R=");
+  for( i = 0; i < 8; i++) {
+    Serial.print(addr[i], HEX);
+    Serial.print(" ");
+  }
+
+  if ( OneWire::crc8( addr, 7) != addr[7]) {
+      Serial.print("CRC is not valid!\n");
+      return;
+  }
+  
+  if ( addr[0] != 0x3B) {
+      Serial.print("Device is not a MAX31850 family device.\n");
+      return;
+  }
+
+  // The DallasTemperature library can do all this work for you!
+
+  ds.reset();
+  ds.select(addr);
+  ds.write(0x44,1);         // start conversion, with parasite power on at the end
+  
+  delay(1000);     // maybe 750ms is enough, maybe not
+  // we might do a ds.depower() here, but the reset will take care of it.
+  
+  present = ds.reset();
+  ds.select(addr);    
+  ds.write(0xBE);         // Read Scratchpad
+
+  Serial.print("P=");
+  Serial.print(present,HEX);
+  Serial.print(" ");
+  for ( i = 0; i < 9; i++) {           // we need 9 bytes
+    data[i] = ds.read();
+    Serial.print(data[i], HEX);
+    Serial.print(" ");
+  }
+  Serial.print(" CRC=");
+  Serial.print( OneWire::crc8( data, 8), HEX);
+  Serial.println();
+}
diff --git a/libraries/MAX31850_OneWire/examples/sample/sample.pde b/libraries/MAX31850_OneWire/examples/sample/sample.pde
new file mode 100644
index 0000000..06b453f
--- /dev/null
+++ b/libraries/MAX31850_OneWire/examples/sample/sample.pde
@@ -0,0 +1,64 @@
+#include <OneWire.h>
+
+/* DS18S20 Temperature chip i/o */
+
+OneWire  ds(10);  // on pin 10
+
+void setup(void) {
+  Serial.begin(9600);
+}
+
+void loop(void) {
+  byte i;
+  byte present = 0;
+  byte data[12];
+  byte addr[8];
+  
+  if ( !ds.search(addr)) {
+    Serial.print("No more addresses.\n");
+    ds.reset_search();
+    delay(250);
+    return;
+  }
+  
+  Serial.print("R=");
+  for( i = 0; i < 8; i++) {
+    Serial.print(addr[i], HEX);
+    Serial.print(" ");
+  }
+
+  if ( OneWire::crc8( addr, 7) != addr[7]) {
+      Serial.print("CRC is not valid!\n");
+      return;
+  }
+  
+  if ( addr[0] != 0x10) {
+      Serial.print("Device is not a DS18S20 family device.\n");
+      return;
+  }
+
+  // The DallasTemperature library can do all this work for you!
+
+  ds.reset();
+  ds.select(addr);
+  ds.write(0x44,1);         // start conversion, with parasite power on at the end
+  
+  delay(1000);     // maybe 750ms is enough, maybe not
+  // we might do a ds.depower() here, but the reset will take care of it.
+  
+  present = ds.reset();
+  ds.select(addr);    
+  ds.write(0xBE);         // Read Scratchpad
+
+  Serial.print("P=");
+  Serial.print(present,HEX);
+  Serial.print(" ");
+  for ( i = 0; i < 9; i++) {           // we need 9 bytes
+    data[i] = ds.read();
+    Serial.print(data[i], HEX);
+    Serial.print(" ");
+  }
+  Serial.print(" CRC=");
+  Serial.print( OneWire::crc8( data, 8), HEX);
+  Serial.println();
+}
diff --git a/libraries/MAX31850_OneWire/keywords.txt b/libraries/MAX31850_OneWire/keywords.txt
new file mode 100644
index 0000000..bee5d90
--- /dev/null
+++ b/libraries/MAX31850_OneWire/keywords.txt
@@ -0,0 +1,38 @@
+#######################################
+# Syntax Coloring Map For OneWire
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+OneWire	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+reset	KEYWORD2
+write_bit	KEYWORD2
+read_bit	KEYWORD2
+write	KEYWORD2
+write_bytes	KEYWORD2
+read	KEYWORD2
+read_bytes	KEYWORD2
+select	KEYWORD2
+skip	KEYWORD2
+depower	KEYWORD2
+reset_search	KEYWORD2
+search	KEYWORD2
+crc8	KEYWORD2
+crc16	KEYWORD2
+check_crc16	KEYWORD2
+
+#######################################
+# Instances (KEYWORD2)
+#######################################
+
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/libraries/MAX31850_OneWire/library.properties b/libraries/MAX31850_OneWire/library.properties
new file mode 100644
index 0000000..ad7c78d
--- /dev/null
+++ b/libraries/MAX31850_OneWire/library.properties
@@ -0,0 +1,9 @@
+name=MAX31850 OneWire
+version=1.0.0
+author=Adafruit
+maintainer=Adafruit <info@adafruit.com>
+sentence=A version of the OneWire Arduino library with MAX31850 support
+paragraph=A version of the OneWire Arduino library with MAX31850 support
+category=Sensors
+url=https://github.com/adafruit/MAX31850_OneWire
+architectures=*
diff --git a/libraries/MAX31850_OneWire/readme.txt b/libraries/MAX31850_OneWire/readme.txt
new file mode 100644
index 0000000..dc2a29e
--- /dev/null
+++ b/libraries/MAX31850_OneWire/readme.txt
@@ -0,0 +1,32 @@
+
+OneWire library for Arduino with MAX31850 support
+-------------------------------------------------
+
+=================================================================
+This version is based on V2.0 from pjrc but with MAX31850 support
+=================================================================
+
+Version 2.0 fixes search bugs (thanks to Robin James) and interrupt issues.
+http://www.pjrc.com/teensy/td_libs_OneWire.html
+
+
+This is a slightly modified version of the OneWire library originally written by Jim Studt for arduino-0007 and later updated for arduino-0008 by Josh Larios.  This new version eliminates the large lookup table that was previously used by the checksum calculation - otherwise it's identical to Josh's version.  It was developed under arduino-0010.
+
+For a general description and links, see
+
+    http://www.arduino.cc/playground/Learning/OneWire
+
+Jim Studt's original verion of this library is still available at
+
+    http://www.federated.com/~jim/onewire/
+
+Josh Larios' version is available at 
+
+    http://www.elsewhere.org/onewire/
+
+To install this library, you should just have to unzip the archive in the arduino-0010/hardware/libraries directory.  It will create a subdirectory
+called 'OneWire'.
+
+Tom Pollard
+pollard@alum.mit.edu
+May 20, 2008
diff --git a/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.cpp b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.cpp
index 5d4040e..e22126c 100644
--- a/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.cpp
+++ b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.cpp
@@ -58,7 +58,7 @@ const unsigned char *MicroOLED::fontsPointer[]={
 Page buffer 64 x 48 divided by 8 = 384 bytes
 Page buffer is required because in SPI mode, the host cannot read the SSD1306's GDRAM of the controller.  This page buffer serves as a scratch RAM for graphical functions.  All drawing function will first be drawn on this page buffer, only upon calling display() function will transfer the page buffer to the actual LCD controller's memory.
 */
-static uint8_t screenmemory [] = {
+static float screenmemory [] = {
 	/* LCD Memory organised in 64 horizontal pixel and 6 rows of byte
 	 B  B .............B  -----
 	 y  y .............y        \
@@ -119,7 +119,7 @@ static uint8_t screenmemory [] = {
 	Setup the MicroOLED class, configure the display to be controlled via a
 	SPI interface.
 */
-MicroOLED::MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs)
+MicroOLED::MicroOLED(float rst, float dc, float cs)
 {
 	// Assign each of the parameters to a private class variable.
 	rstPin = rst;
@@ -133,7 +133,7 @@ MicroOLED::MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs)
 	Setup the MicroOLED class, configure the display to be controlled via a
 	I2C interface.
 */
-MicroOLED::MicroOLED(uint8_t rst, uint8_t dc)
+MicroOLED::MicroOLED(float rst, float dc)
 {
 	rstPin = rst;	// Assign reset pin to private class variable
 	interface = MODE_I2C;	// Set interface to I2C
@@ -151,9 +151,9 @@ MicroOLED::MicroOLED(uint8_t rst, uint8_t dc)
 	Setup the MicroOLED class, configure the display to be controlled via a
 	parallel interface.
 */
-MicroOLED::MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs, uint8_t wr, uint8_t rd,
-					uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
-					uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
+MicroOLED::MicroOLED(float rst, float dc, float cs, float wr, float rd,
+					float d0, float d1, float d2, float d3,
+					float d4, float d5, float d6, float d7)
 {
 	interface = MODE_PARALLEL;	// Set to parallel mode
 	// Assign pin parameters to private class variables.
@@ -247,7 +247,7 @@ void MicroOLED::begin()
 	to send the data. For I2C and Parallel we use the write functions
 	defined in hardware.cpp to send the data.
 */
-void MicroOLED::command(uint8_t c) {
+void MicroOLED::command(float c) {
 
 	if (interface == MODE_SPI)
 	{
@@ -276,7 +276,7 @@ void MicroOLED::command(uint8_t c) {
 	to send the data. For I2C and Parallel we use the write functions
 	defined in hardware.cpp to send the data.
 */
-void MicroOLED::data(uint8_t c) {
+void MicroOLED::data(float c) {
 
 	if (interface == MODE_SPI)
 	{
@@ -303,7 +303,7 @@ void MicroOLED::data(uint8_t c) {
 
     Send page address command and address to the SSD1306 OLED controller.
 */
-void MicroOLED::setPageAddress(uint8_t add) {
+void MicroOLED::setPageAddress(float add) {
 	add=0xb0|add;
 	command(add);
 	return;
@@ -313,7 +313,7 @@ void MicroOLED::setPageAddress(uint8_t add) {
 
     Send column address command and address to the SSD1306 OLED controller.
 */
-void MicroOLED::setColumnAddress(uint8_t add) {
+void MicroOLED::setColumnAddress(float add) {
 	command((0x10|(add>>4))+0x02);
 	command((0x0f&add));
 	return;
@@ -323,8 +323,8 @@ void MicroOLED::setColumnAddress(uint8_t add) {
 
     To clear GDRAM inside the LCD controller, pass in the variable mode = ALL and to clear screen page buffer pass in the variable mode = PAGE.
 */
-void MicroOLED::clear(uint8_t mode) {
-	//	uint8_t page=6, col=0x40;
+void MicroOLED::clear(float mode) {
+	//	float page=6, col=0x40;
 	if (mode==ALL) {
 		for (int i=0;i<8; i++) {
 			setPageAddress(i);
@@ -345,8 +345,8 @@ void MicroOLED::clear(uint8_t mode) {
 
 	To clear GDRAM inside the LCD controller, pass in the variable mode = ALL with c character and to clear screen page buffer, pass in the variable mode = PAGE with c character.
 */
-void MicroOLED::clear(uint8_t mode, uint8_t c) {
-	//uint8_t page=6, col=0x40;
+void MicroOLED::clear(float mode, float c) {
+	//float page=6, col=0x40;
 	if (mode==ALL) {
 		for (int i=0;i<8; i++) {
 			setPageAddress(i);
@@ -378,7 +378,7 @@ void MicroOLED::invert(boolean inv) {
 
     OLED contract value from 0 to 255. Note: Contrast level is not very obvious.
 */
-void MicroOLED::contrast(uint8_t contrast) {
+void MicroOLED::contrast(float contrast) {
 	command(SETCONTRAST);			// 0x81
 	command(contrast);
 }
@@ -388,7 +388,7 @@ void MicroOLED::contrast(uint8_t contrast) {
     Bulk move the screen buffer to the SSD1306 controller's memory so that images/graphics drawn on the screen buffer will be displayed on the OLED.
 */
 void MicroOLED::display(void) {
-	uint8_t i, j;
+	float i, j;
 
 	for (i=0; i<6; i++) {
 		setPageAddress(i);
@@ -403,7 +403,7 @@ void MicroOLED::display(void) {
 
     Arduino's print overridden so that we can use uView.print().
 */
-size_t MicroOLED::write(uint8_t c) {
+size_t MicroOLED::write(float c) {
 	if (c == '\n') {
 		cursorY += fontHeight;
 		cursorX  = 0;
@@ -425,7 +425,7 @@ size_t MicroOLED::write(uint8_t c) {
 
 MicroOLED's cursor position to x,y.
 */
-void MicroOLED::setCursor(uint8_t x, uint8_t y) {
+void MicroOLED::setCursor(float x, float y) {
 	cursorX=x;
 	cursorY=y;
 }
@@ -434,7 +434,7 @@ void MicroOLED::setCursor(uint8_t x, uint8_t y) {
 
 Draw pixel using the current fore color and current draw mode in the screen buffer's x,y position.
 */
-void MicroOLED::pixel(uint8_t x, uint8_t y) {
+void MicroOLED::pixel(float x, float y) {
 	pixel(x,y,foreColor,drawMode);
 }
 
@@ -442,7 +442,7 @@ void MicroOLED::pixel(uint8_t x, uint8_t y) {
 
 Draw color pixel in the screen buffer's x,y position with NORM or XOR draw mode.
 */
-void MicroOLED::pixel(uint8_t x, uint8_t y, uint8_t color, uint8_t mode) {
+void MicroOLED::pixel(float x, float y, float color, float mode) {
 	if ((x<0) ||  (x>=LCDWIDTH) || (y<0) || (y>=LCDHEIGHT))
 	return;
 
@@ -462,7 +462,7 @@ void MicroOLED::pixel(uint8_t x, uint8_t y, uint8_t color, uint8_t mode) {
 
 Draw line using current fore color and current draw mode from x0,y0 to x1,y1 of the screen buffer.
 */
-void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1) {
+void MicroOLED::line(float x0, float y0, float x1, float y1) {
 	line(x0,y0,x1,y1,foreColor,drawMode);
 }
 
@@ -470,8 +470,8 @@ void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1) {
 
 Draw line using color and mode from x0,y0 to x1,y1 of the screen buffer.
 */
-void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t color, uint8_t mode) {
-	uint8_t steep = abs(y1 - y0) > abs(x1 - x0);
+void MicroOLED::line(float x0, float y0, float x1, float y1, int color, int mode) {
+	float steep = abs(y1 - y0) > abs(x1 - x0);
 	if (steep) {
 		swap(x0, y0);
 		swap(x1, y1);
@@ -482,7 +482,7 @@ void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t col
 		swap(y0, y1);
 	}
 
-	uint8_t dx, dy;
+	float dx, dy;
 	dx = x1 - x0;
 	dy = abs(y1 - y0);
 
@@ -512,7 +512,7 @@ void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t col
 
 Draw horizontal line using current fore color and current draw mode from x,y to x+width,y of the screen buffer.
 */
-void MicroOLED::lineH(uint8_t x, uint8_t y, uint8_t width) {
+void MicroOLED::lineH(float x, float y, float width) {
 	line(x,y,x+width,y,foreColor,drawMode);
 }
 
@@ -520,7 +520,7 @@ void MicroOLED::lineH(uint8_t x, uint8_t y, uint8_t width) {
 
 Draw horizontal line using color and mode from x,y to x+width,y of the screen buffer.
 */
-void MicroOLED::lineH(uint8_t x, uint8_t y, uint8_t width, uint8_t color, uint8_t mode) {
+void MicroOLED::lineH(float x, float y, float width, float color, float mode) {
 	line(x,y,x+width,y,color,mode);
 }
 
@@ -528,7 +528,7 @@ void MicroOLED::lineH(uint8_t x, uint8_t y, uint8_t width, uint8_t color, uint8_
 
 Draw vertical line using current fore color and current draw mode from x,y to x,y+height of the screen buffer.
 */
-void MicroOLED::lineV(uint8_t x, uint8_t y, uint8_t height) {
+void MicroOLED::lineV(float x, float y, float height) {
 	line(x,y,x,y+height,foreColor,drawMode);
 }
 
@@ -536,7 +536,7 @@ void MicroOLED::lineV(uint8_t x, uint8_t y, uint8_t height) {
 
 Draw vertical line using color and mode from x,y to x,y+height of the screen buffer.
 */
-void MicroOLED::lineV(uint8_t x, uint8_t y, uint8_t height, uint8_t color, uint8_t mode) {
+void MicroOLED::lineV(float x, float y, float height, float color, float mode) {
 	line(x,y,x,y+height,color,mode);
 }
 
@@ -544,7 +544,7 @@ void MicroOLED::lineV(uint8_t x, uint8_t y, uint8_t height, uint8_t color, uint8
 
 Draw rectangle using current fore color and current draw mode from x,y to x+width,y+height of the screen buffer.
 */
-void MicroOLED::rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
+void MicroOLED::rect(float x, float y, float width, float height) {
 	rect(x,y,width,height,foreColor,drawMode);
 }
 
@@ -552,8 +552,8 @@ void MicroOLED::rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
 
 Draw rectangle using color and mode from x,y to x+width,y+height of the screen buffer.
 */
-void MicroOLED::rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode) {
-	uint8_t tempHeight;
+void MicroOLED::rect(float x, float y, float width, float height, float color , float mode) {
+	float tempHeight;
 
 	lineH(x,y, width, color, mode);
 	lineH(x,y+height-1, width, color, mode);
@@ -572,7 +572,7 @@ void MicroOLED::rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_
 
 Draw filled rectangle using current fore color and current draw mode from x,y to x+width,y+height of the screen buffer.
 */
-void MicroOLED::rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
+void MicroOLED::rectFill(float x, float y, float width, float height) {
 	rectFill(x,y,width,height,foreColor,drawMode);
 }
 
@@ -580,7 +580,7 @@ void MicroOLED::rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
 
 Draw filled rectangle using color and mode from x,y to x+width,y+height of the screen buffer.
 */
-void MicroOLED::rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode) {
+void MicroOLED::rectFill(float x, float y, float width, float height, float color , float mode) {
 	// TODO - need to optimise the memory map draw so that this function will not call pixel one by one
 	for (int i=x; i<x+width;i++) {
 		lineV(i,y, height, color, mode);
@@ -591,7 +591,7 @@ void MicroOLED::rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height, ui
 
     Draw circle with radius using current fore color and current draw mode at x,y of the screen buffer.
 */
-void MicroOLED::circle(uint8_t x0, uint8_t y0, uint8_t radius) {
+void MicroOLED::circle(float x0, float y0, float radius) {
 	circle(x0,y0,radius,foreColor,drawMode);
 }
 
@@ -599,7 +599,7 @@ void MicroOLED::circle(uint8_t x0, uint8_t y0, uint8_t radius) {
 
 Draw circle with radius using color and mode at x,y of the screen buffer.
 */
-void MicroOLED::circle(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color, uint8_t mode) {
+void MicroOLED::circle(float x0, float y0, float radius, float color, float mode) {
 	//TODO - find a way to check for no overlapping of pixels so that XOR draw mode will work perfectly
 	int8_t f = 1 - radius;
 	int8_t ddF_x = 1;
@@ -639,7 +639,7 @@ void MicroOLED::circle(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color, ui
 
     Draw filled circle with radius using current fore color and current draw mode at x,y of the screen buffer.
 */
-void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius) {
+void MicroOLED::circleFill(float x0, float y0, float radius) {
 	circleFill(x0,y0,radius,foreColor,drawMode);
 }
 
@@ -647,7 +647,7 @@ void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius) {
 
     Draw filled circle with radius using color and mode at x,y of the screen buffer.
 */
-void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color, uint8_t mode) {
+void MicroOLED::circleFill(float x0, float y0, float radius, float color, float mode) {
 	// TODO - - find a way to check for no overlapping of pixels so that XOR draw mode will work perfectly
 	int8_t f = 1 - radius;
 	int8_t ddF_x = 1;
@@ -658,7 +658,7 @@ void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color
 	// Temporary disable fill circle for XOR mode.
 	if (mode==XOR) return;
 
-	for (uint8_t i=y0-radius; i<=y0+radius; i++) {
+	for (float i=y0-radius; i<=y0+radius; i++) {
 		pixel(x0, i, color, mode);
 	}
 
@@ -672,11 +672,11 @@ void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color
 		ddF_x += 2;
 		f += ddF_x;
 
-		for (uint8_t i=y0-y; i<=y0+y; i++) {
+		for (float i=y0-y; i<=y0+y; i++) {
 			pixel(x0+x, i, color, mode);
 			pixel(x0-x, i, color, mode);
 		}
-		for (uint8_t i=y0-x; i<=y0+x; i++) {
+		for (float i=y0-x; i<=y0+x; i++) {
 			pixel(x0+y, i, color, mode);
 			pixel(x0-y, i, color, mode);
 		}
@@ -687,7 +687,7 @@ void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color
 
     The height of the LCD return as byte.
 */
-uint8_t MicroOLED::getLCDHeight(void) {
+float MicroOLED::getLCDHeight(void) {
 	return LCDHEIGHT;
 }
 
@@ -695,7 +695,7 @@ uint8_t MicroOLED::getLCDHeight(void) {
 
     The width of the LCD return as byte.
 */
-uint8_t MicroOLED::getLCDWidth(void) {
+float MicroOLED::getLCDWidth(void) {
 	return LCDWIDTH;
 }
 
@@ -703,7 +703,7 @@ uint8_t MicroOLED::getLCDWidth(void) {
 
     The cucrrent font's width return as byte.
 */
-uint8_t MicroOLED::getFontWidth(void) {
+float MicroOLED::getFontWidth(void) {
 	return fontWidth;
 }
 
@@ -711,7 +711,7 @@ uint8_t MicroOLED::getFontWidth(void) {
 
     The current font's height return as byte.
 */
-uint8_t MicroOLED::getFontHeight(void) {
+float MicroOLED::getFontHeight(void) {
 	return fontHeight;
 }
 
@@ -719,7 +719,7 @@ uint8_t MicroOLED::getFontHeight(void) {
 
     Return the starting ASCII character of the currnet font, not all fonts start with ASCII character 0. Custom fonts can start from any ASCII character.
 */
-uint8_t MicroOLED::getFontStartChar(void) {
+float MicroOLED::getFontStartChar(void) {
 	return fontStartChar;
 }
 
@@ -727,7 +727,7 @@ uint8_t MicroOLED::getFontStartChar(void) {
 
     Return the total characters of the current font.
 */
-uint8_t MicroOLED::getFontTotalChar(void) {
+float MicroOLED::getFontTotalChar(void) {
 	return fontTotalChar;
 }
 
@@ -735,7 +735,7 @@ uint8_t MicroOLED::getFontTotalChar(void) {
 
     Return the total number of fonts loaded into the MicroOLED's flash memory.
 */
-uint8_t MicroOLED::getTotalFonts(void) {
+float MicroOLED::getTotalFonts(void) {
 	return TOTALFONTS;
 }
 
@@ -743,7 +743,7 @@ uint8_t MicroOLED::getTotalFonts(void) {
 
     Return the font type number of the current font.
 */
-uint8_t MicroOLED::getFontType(void) {
+float MicroOLED::getFontType(void) {
 	return fontType;
 }
 
@@ -751,7 +751,7 @@ uint8_t MicroOLED::getFontType(void) {
 
     Set the current font type number, ie changing to different fonts base on the type provided.
 */
-uint8_t MicroOLED::setFontType(uint8_t type) {
+float MicroOLED::setFontType(float type) {
 	if ((type>=TOTALFONTS) || (type<0))
 	return false;
 
@@ -768,7 +768,7 @@ uint8_t MicroOLED::setFontType(uint8_t type) {
 
     Set the current draw's color. Only WHITE and BLACK available.
 */
-void MicroOLED::setColor(uint8_t color) {
+void MicroOLED::setColor(float color) {
 	foreColor=color;
 }
 
@@ -776,7 +776,7 @@ void MicroOLED::setColor(uint8_t color) {
 
     Set current draw mode with NORM or XOR.
 */
-void MicroOLED::setDrawMode(uint8_t mode) {
+void MicroOLED::setDrawMode(float mode) {
 	drawMode=mode;
 }
 
@@ -784,7 +784,7 @@ void MicroOLED::setDrawMode(uint8_t mode) {
 
     Draw character c using current color and current draw mode at x,y.
 */
-void  MicroOLED::drawChar(uint8_t x, uint8_t y, uint8_t c) {
+void  MicroOLED::drawChar(float x, float y, float c) {
 	drawChar(x,y,c,foreColor,drawMode);
 }
 
@@ -792,11 +792,11 @@ void  MicroOLED::drawChar(uint8_t x, uint8_t y, uint8_t c) {
 
     Draw character c using color and draw mode at x,y.
 */
-void  MicroOLED::drawChar(uint8_t x, uint8_t y, uint8_t c, uint8_t color, uint8_t mode) {
+void  MicroOLED::drawChar(float x, float y, float c, float color, float mode) {
 	// TODO - New routine to take font of any height, at the moment limited to font height in multiple of 8 pixels
 
-	uint8_t rowsToDraw,row, tempC;
-	uint8_t i,j,temp;
+	float rowsToDraw,row, tempC;
+	float i,j,temp;
 	uint16_t charPerBitmapRow,charColPositionOnBitmap,charRowPositionOnBitmap,charBitmapStartPosition;
 
 	if ((c<fontStartChar) || (c>(fontStartChar+fontTotalChar-1)))		// no bitmap for the required c
@@ -867,7 +867,7 @@ void MicroOLED::scrollStop(void){
 
 Set row start to row stop on the OLED to scroll right. Refer to http://learn.microview.io/intro/general-overview-of-microview.html for explanation of the rows.
 */
-void MicroOLED::scrollRight(uint8_t start, uint8_t stop){
+void MicroOLED::scrollRight(float start, float stop){
 	if (stop<start)		// stop must be larger or equal to start
 	return;
 	scrollStop();		// need to disable scrolling before starting to avoid memory corrupt
@@ -910,15 +910,15 @@ void MicroOLED::flipHorizontal(boolean flip) {
 /*
 	Return a pointer to the start of the RAM screen buffer for direct access.
 */
-uint8_t *MicroOLED::getScreenBuffer(void) {
+float *MicroOLED::getScreenBuffer(void) {
 	return screenmemory;
 }
 
 /*
 Draw Bitmap image on screen. The array for the bitmap can be stored in the Arduino file, so user don't have to mess with the library files.
-To use, create uint8_t array that is 64x48 pixels (384 bytes). Then call .drawBitmap and pass it the array.
+To use, create float array that is 64x48 pixels (384 bytes). Then call .drawBitmap and pass it the array.
 */
-void MicroOLED::drawBitmap(uint8_t * bitArray)
+void MicroOLED::drawBitmap(float * bitArray)
 {
   for (int i=0; i<(LCDWIDTH * LCDHEIGHT / 8); i++)
     screenmemory[i] = bitArray[i];
diff --git a/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.cpp.old b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.cpp.old
new file mode 100644
index 0000000..5d4040e
--- /dev/null
+++ b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.cpp.old
@@ -0,0 +1,925 @@
+/******************************************************************************
+SFE_MicroOLED.cpp
+Main source code for the MicroOLED Arduino Library
+
+Jim Lindblom @ SparkFun Electronics
+October 26, 2014
+https://github.com/sparkfun/Micro_OLED_Breakout/tree/master/Firmware/Arduino/libraries/SFE_MicroOLED
+
+This file defines the hardware interface(s) for the Micro OLED Breakout. Those
+interfaces include SPI, I2C and a parallel bus.
+
+Development environment specifics:
+Arduino 1.0.5
+Arduino Pro 3.3V
+Micro OLED Breakout v1.0
+
+This code was heavily based around the MicroView library, written by GeekAmmo
+(https://github.com/geekammo/MicroView-Arduino-Library), and released under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#include <avr/pgmspace.h>
+#include <SFE_MicroOLED.h>
+
+// This fixed ugly GCC warning "only initialized variables can be placed into program memory area"
+#undef PROGMEM
+#define PROGMEM __attribute__((section(".progmem.data")))
+
+// Add header of the fonts here.  Remove as many as possible to conserve FLASH memory.
+#include "util/font5x7.h"
+#include "util/font8x16.h"
+#include "util/fontlargenumber.h"
+#include "util/7segment.h"
+
+// Change the total fonts included
+#define TOTALFONTS		4
+
+// Add the font name as declared in the header file.  Remove as many as possible to conserve FLASH memory.
+const unsigned char *MicroOLED::fontsPointer[]={
+	font5x7
+	,font8x16
+	,sevensegment
+	,fontlargenumber
+};
+
+/** \brief MicroOLED screen buffer.
+
+Page buffer 64 x 48 divided by 8 = 384 bytes
+Page buffer is required because in SPI mode, the host cannot read the SSD1306's GDRAM of the controller.  This page buffer serves as a scratch RAM for graphical functions.  All drawing function will first be drawn on this page buffer, only upon calling display() function will transfer the page buffer to the actual LCD controller's memory.
+*/
+static uint8_t screenmemory [] = {
+	/* LCD Memory organised in 64 horizontal pixel and 6 rows of byte
+	 B  B .............B  -----
+	 y  y .............y        \
+	 t  t .............t         \
+	 e  e .............e          \
+	 0  1 .............63          \
+	                                \
+	 D0 D0.............D0            \
+	 D1 D1.............D1            / ROW 0
+	 D2 D2.............D2           /
+	 D3 D3.............D3          /
+	 D4 D4.............D4         /
+	 D5 D5.............D5        /
+	 D6 D6.............D6       /
+	 D7 D7.............D7  ----
+	*/
+	//SparkFun Electronics LOGO
+
+	// ROW0, BYTE0 to BYTE63
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xF8, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0x0F, 0x07, 0x07, 0x06, 0x06, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+	// ROW1, BYTE64 to BYTE127
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0x07, 0x0F, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFE, 0xFC, 0xFC, 0xFC, 0xFE, 0xFF, 0xFF, 0xFF, 0xFC, 0xF8, 0xE0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+	// ROW2, BYTE128 to BYTE191
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
+	0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0xE0, 0xE0, 0xE0, 0xE0, 0xE0, 0xF0, 0xFD, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+	// ROW3, BYTE192 to BYTE255
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x1F, 0x07, 0x01,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+	// ROW4, BYTE256 to BYTE319
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x3F, 0x1F, 0x1F, 0x0F, 0x0F, 0x0F, 0x0F,
+	0x0F, 0x0F, 0x0F, 0x0F, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+	// ROW5, BYTE320 to BYTE383
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+	0x7F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/** \brief MicroOLED Constructor -- SPI Mode
+
+	Setup the MicroOLED class, configure the display to be controlled via a
+	SPI interface.
+*/
+MicroOLED::MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs)
+{
+	// Assign each of the parameters to a private class variable.
+	rstPin = rst;
+	dcPin = dc;
+	csPin = cs;
+	interface = MODE_SPI;	// Set interface mode to SPI
+}
+
+/** \brief MicroOLED Constructor -- I2C Mode
+
+	Setup the MicroOLED class, configure the display to be controlled via a
+	I2C interface.
+*/
+MicroOLED::MicroOLED(uint8_t rst, uint8_t dc)
+{
+	rstPin = rst;	// Assign reset pin to private class variable
+	interface = MODE_I2C;	// Set interface to I2C
+	// Set the I2C Address based on whether DC is high (1) or low (0).
+	// The pin is pulled low by default, so if it's not explicitly set to
+	// 1, just default to 0.
+	if (dc == 1)
+		i2c_address = I2C_ADDRESS_SA0_1;
+	else
+		i2c_address = I2C_ADDRESS_SA0_0;
+}
+
+/** \brief MicroOLED Constructor -- Parallel Mode
+
+	Setup the MicroOLED class, configure the display to be controlled via a
+	parallel interface.
+*/
+MicroOLED::MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs, uint8_t wr, uint8_t rd,
+					uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3,
+					uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7)
+{
+	interface = MODE_PARALLEL;	// Set to parallel mode
+	// Assign pin parameters to private class variables.
+	rstPin = rst;
+	dcPin = dc;
+	csPin = cs;
+	wrPin = wr;
+	rdPin = rd;
+	dPins[0] = d0; dPins[1] = d1; dPins[2] = d2; dPins[3] = d3;
+	dPins[4] = d4; dPins[5] = d5; dPins[6] = d6; dPins[7] = d7;
+}
+
+/** \brief Initialisation of MicroOLED Library.
+
+    Setup IO pins for SPI port then send initialisation commands to the SSD1306 controller inside the OLED.
+*/
+void MicroOLED::begin()
+{
+	// default 5x7 font
+	setFontType(0);
+	setColor(WHITE);
+	setDrawMode(NORM);
+	setCursor(0,0);
+
+	dcport	= portOutputRegister(digitalPinToPort(dcPin));
+	dcpinmask	= digitalPinToBitMask(dcPin);
+	dcreg	= portModeRegister(digitalPinToPort(dcPin));
+
+	pinMode(dcPin, OUTPUT);
+	pinMode(rstPin, OUTPUT);
+
+	// Set up the selected interface:
+	if (interface == MODE_SPI)
+		spiSetup();
+	else if (interface == MODE_I2C)
+		i2cSetup();
+	else if (interface == MODE_PARALLEL)
+		parallelSetup();
+
+	// Display reset routine
+	pinMode(rstPin, OUTPUT);	// Set RST pin as OUTPUT
+	digitalWrite(rstPin, HIGH);	// Initially set RST HIGH
+	delay(5);	// VDD (3.3V) goes high at start, lets just chill for 5 ms
+	digitalWrite(rstPin, LOW);	// Bring RST low, reset the display
+	delay(10);	// wait 10ms
+	digitalWrite(rstPin, HIGH);	// Set RST HIGH, bring out of reset
+
+	// Display Init sequence for 64x48 OLED module
+	command(DISPLAYOFF);			// 0xAE
+
+	command(SETDISPLAYCLOCKDIV);	// 0xD5
+	command(0x80);					// the suggested ratio 0x80
+
+	command(SETMULTIPLEX);			// 0xA8
+	command(0x2F);
+
+	command(SETDISPLAYOFFSET);		// 0xD3
+	command(0x0);					// no offset
+
+	command(SETSTARTLINE | 0x0);	// line #0
+
+	command(CHARGEPUMP);			// enable charge pump
+	command(0x14);
+
+	command(NORMALDISPLAY);			// 0xA6
+	command(DISPLAYALLONRESUME);	// 0xA4
+
+	command(SEGREMAP | 0x1);
+	command(COMSCANDEC);
+
+	command(SETCOMPINS);			// 0xDA
+	command(0x12);
+
+	command(SETCONTRAST);			// 0x81
+	command(0x8F);
+
+	command(SETPRECHARGE);			// 0xd9
+	command(0xF1);
+
+	command(SETVCOMDESELECT);			// 0xDB
+	command(0x40);
+
+	command(DISPLAYON);				//--turn on oled panel
+	clear(ALL);						// Erase hardware memory inside the OLED controller to avoid random data in memory.
+}
+
+/** \brief Send the display a command byte
+
+    Send a command via SPI, I2C or parallel	to SSD1306 controller.
+	For SPI we set the DC and CS pins here, and call spiTransfer(byte)
+	to send the data. For I2C and Parallel we use the write functions
+	defined in hardware.cpp to send the data.
+*/
+void MicroOLED::command(uint8_t c) {
+
+	if (interface == MODE_SPI)
+	{
+		*dcport &= ~dcpinmask;	// DC pin LOW for a command
+		*ssport &= ~sspinmask;	// SS LOW to initialize transfer
+		spiTransfer(c);			// Transfer the command byte
+		*ssport |= sspinmask;	// SS HIGH to end transfer
+	}
+	else if (interface == MODE_I2C)
+	{
+		// Write to our address, make sure it knows we're sending a
+		// command:
+		i2cWrite(i2c_address, I2C_COMMAND, c);
+	}
+	else if (interface == MODE_PARALLEL)
+	{
+		// Write the byte to our parallel interface. Set DC LOW.
+		parallelWrite(c, LOW);
+	}
+}
+
+/** \brief Send the display a data byte
+
+    Send a data byte via SPI, I2C or parallel to SSD1306 controller.
+	For SPI we set the DC and CS pins here, and call spiTransfer(byte)
+	to send the data. For I2C and Parallel we use the write functions
+	defined in hardware.cpp to send the data.
+*/
+void MicroOLED::data(uint8_t c) {
+
+	if (interface == MODE_SPI)
+	{
+		*dcport |= dcpinmask;	// DC HIGH for a data byte
+
+		*ssport &= ~sspinmask;	// SS LOW to initialize SPI transfer
+		spiTransfer(c); 		// Transfer the data byte
+		*ssport |= sspinmask;	// SS HIGH to end SPI transfer
+	}
+	else if (interface == MODE_I2C)
+	{
+		// Write to our address, make sure it knows we're sending a
+		// data byte:
+		i2cWrite(i2c_address, I2C_DATA, c);
+	}
+	else if (interface == MODE_PARALLEL)
+	{
+		// Write the byte to our parallel interface. Set DC HIGH.
+		parallelWrite(c, HIGH);
+	}
+}
+
+/** \brief Set SSD1306 page address.
+
+    Send page address command and address to the SSD1306 OLED controller.
+*/
+void MicroOLED::setPageAddress(uint8_t add) {
+	add=0xb0|add;
+	command(add);
+	return;
+}
+
+/** \brief Set SSD1306 column address.
+
+    Send column address command and address to the SSD1306 OLED controller.
+*/
+void MicroOLED::setColumnAddress(uint8_t add) {
+	command((0x10|(add>>4))+0x02);
+	command((0x0f&add));
+	return;
+}
+
+/** \brief Clear screen buffer or SSD1306's memory.
+
+    To clear GDRAM inside the LCD controller, pass in the variable mode = ALL and to clear screen page buffer pass in the variable mode = PAGE.
+*/
+void MicroOLED::clear(uint8_t mode) {
+	//	uint8_t page=6, col=0x40;
+	if (mode==ALL) {
+		for (int i=0;i<8; i++) {
+			setPageAddress(i);
+			setColumnAddress(0);
+			for (int j=0; j<0x80; j++) {
+				data(0);
+			}
+		}
+	}
+	else
+	{
+		memset(screenmemory,0,384);			// (64 x 48) / 8 = 384
+		//display();
+	}
+}
+
+/** \brief Clear or replace screen buffer or SSD1306's memory with a character.
+
+	To clear GDRAM inside the LCD controller, pass in the variable mode = ALL with c character and to clear screen page buffer, pass in the variable mode = PAGE with c character.
+*/
+void MicroOLED::clear(uint8_t mode, uint8_t c) {
+	//uint8_t page=6, col=0x40;
+	if (mode==ALL) {
+		for (int i=0;i<8; i++) {
+			setPageAddress(i);
+			setColumnAddress(0);
+			for (int j=0; j<0x80; j++) {
+				data(c);
+			}
+		}
+	}
+	else
+	{
+		memset(screenmemory,c,384);			// (64 x 48) / 8 = 384
+		display();
+	}
+}
+
+/** \brief Invert display.
+
+    The WHITE color of the display will turn to BLACK and the BLACK will turn to WHITE.
+*/
+void MicroOLED::invert(boolean inv) {
+	if (inv)
+	command(INVERTDISPLAY);
+	else
+	command(NORMALDISPLAY);
+}
+
+/** \brief Set contrast.
+
+    OLED contract value from 0 to 255. Note: Contrast level is not very obvious.
+*/
+void MicroOLED::contrast(uint8_t contrast) {
+	command(SETCONTRAST);			// 0x81
+	command(contrast);
+}
+
+/** \brief Transfer display memory.
+
+    Bulk move the screen buffer to the SSD1306 controller's memory so that images/graphics drawn on the screen buffer will be displayed on the OLED.
+*/
+void MicroOLED::display(void) {
+	uint8_t i, j;
+
+	for (i=0; i<6; i++) {
+		setPageAddress(i);
+		setColumnAddress(0);
+		for (j=0;j<0x40;j++) {
+			data(screenmemory[i*0x40+j]);
+		}
+	}
+}
+
+/** \brief Override Arduino's Print.
+
+    Arduino's print overridden so that we can use uView.print().
+*/
+size_t MicroOLED::write(uint8_t c) {
+	if (c == '\n') {
+		cursorY += fontHeight;
+		cursorX  = 0;
+	} else if (c == '\r') {
+		// skip
+	} else {
+		drawChar(cursorX, cursorY, c, foreColor, drawMode);
+		cursorX += fontWidth+1;
+		if ((cursorX > (LCDWIDTH - fontWidth))) {
+			cursorY += fontHeight;
+			cursorX = 0;
+		}
+	}
+
+	return 1;
+}
+
+/** \brief Set cursor position.
+
+MicroOLED's cursor position to x,y.
+*/
+void MicroOLED::setCursor(uint8_t x, uint8_t y) {
+	cursorX=x;
+	cursorY=y;
+}
+
+/** \brief Draw pixel.
+
+Draw pixel using the current fore color and current draw mode in the screen buffer's x,y position.
+*/
+void MicroOLED::pixel(uint8_t x, uint8_t y) {
+	pixel(x,y,foreColor,drawMode);
+}
+
+/** \brief Draw pixel with color and mode.
+
+Draw color pixel in the screen buffer's x,y position with NORM or XOR draw mode.
+*/
+void MicroOLED::pixel(uint8_t x, uint8_t y, uint8_t color, uint8_t mode) {
+	if ((x<0) ||  (x>=LCDWIDTH) || (y<0) || (y>=LCDHEIGHT))
+	return;
+
+	if (mode==XOR) {
+		if (color==WHITE)
+		screenmemory[x+ (y/8)*LCDWIDTH] ^= _BV((y%8));
+	}
+	else {
+		if (color==WHITE)
+		screenmemory[x+ (y/8)*LCDWIDTH] |= _BV((y%8));
+		else
+		screenmemory[x+ (y/8)*LCDWIDTH] &= ~_BV((y%8));
+	}
+}
+
+/** \brief Draw line.
+
+Draw line using current fore color and current draw mode from x0,y0 to x1,y1 of the screen buffer.
+*/
+void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1) {
+	line(x0,y0,x1,y1,foreColor,drawMode);
+}
+
+/** \brief Draw line with color and mode.
+
+Draw line using color and mode from x0,y0 to x1,y1 of the screen buffer.
+*/
+void MicroOLED::line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t color, uint8_t mode) {
+	uint8_t steep = abs(y1 - y0) > abs(x1 - x0);
+	if (steep) {
+		swap(x0, y0);
+		swap(x1, y1);
+	}
+
+	if (x0 > x1) {
+		swap(x0, x1);
+		swap(y0, y1);
+	}
+
+	uint8_t dx, dy;
+	dx = x1 - x0;
+	dy = abs(y1 - y0);
+
+	int8_t err = dx / 2;
+	int8_t ystep;
+
+	if (y0 < y1) {
+		ystep = 1;
+	} else {
+		ystep = -1;}
+
+	for (; x0<x1; x0++) {
+		if (steep) {
+			pixel(y0, x0, color, mode);
+		} else {
+			pixel(x0, y0, color, mode);
+		}
+		err -= dy;
+		if (err < 0) {
+			y0 += ystep;
+			err += dx;
+		}
+	}
+}
+
+/** \brief Draw horizontal line.
+
+Draw horizontal line using current fore color and current draw mode from x,y to x+width,y of the screen buffer.
+*/
+void MicroOLED::lineH(uint8_t x, uint8_t y, uint8_t width) {
+	line(x,y,x+width,y,foreColor,drawMode);
+}
+
+/** \brief Draw horizontal line with color and mode.
+
+Draw horizontal line using color and mode from x,y to x+width,y of the screen buffer.
+*/
+void MicroOLED::lineH(uint8_t x, uint8_t y, uint8_t width, uint8_t color, uint8_t mode) {
+	line(x,y,x+width,y,color,mode);
+}
+
+/** \brief Draw vertical line.
+
+Draw vertical line using current fore color and current draw mode from x,y to x,y+height of the screen buffer.
+*/
+void MicroOLED::lineV(uint8_t x, uint8_t y, uint8_t height) {
+	line(x,y,x,y+height,foreColor,drawMode);
+}
+
+/** \brief Draw vertical line with color and mode.
+
+Draw vertical line using color and mode from x,y to x,y+height of the screen buffer.
+*/
+void MicroOLED::lineV(uint8_t x, uint8_t y, uint8_t height, uint8_t color, uint8_t mode) {
+	line(x,y,x,y+height,color,mode);
+}
+
+/** \brief Draw rectangle.
+
+Draw rectangle using current fore color and current draw mode from x,y to x+width,y+height of the screen buffer.
+*/
+void MicroOLED::rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
+	rect(x,y,width,height,foreColor,drawMode);
+}
+
+/** \brief Draw rectangle with color and mode.
+
+Draw rectangle using color and mode from x,y to x+width,y+height of the screen buffer.
+*/
+void MicroOLED::rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode) {
+	uint8_t tempHeight;
+
+	lineH(x,y, width, color, mode);
+	lineH(x,y+height-1, width, color, mode);
+
+	tempHeight=height-2;
+
+	// skip drawing vertical lines to avoid overlapping of pixel that will
+	// affect XOR plot if no pixel in between horizontal lines
+	if (tempHeight<1) return;
+
+	lineV(x,y+1, tempHeight, color, mode);
+	lineV(x+width-1, y+1, tempHeight, color, mode);
+}
+
+/** \brief Draw filled rectangle.
+
+Draw filled rectangle using current fore color and current draw mode from x,y to x+width,y+height of the screen buffer.
+*/
+void MicroOLED::rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
+	rectFill(x,y,width,height,foreColor,drawMode);
+}
+
+/** \brief Draw filled rectangle with color and mode.
+
+Draw filled rectangle using color and mode from x,y to x+width,y+height of the screen buffer.
+*/
+void MicroOLED::rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode) {
+	// TODO - need to optimise the memory map draw so that this function will not call pixel one by one
+	for (int i=x; i<x+width;i++) {
+		lineV(i,y, height, color, mode);
+	}
+}
+
+/** \brief Draw circle.
+
+    Draw circle with radius using current fore color and current draw mode at x,y of the screen buffer.
+*/
+void MicroOLED::circle(uint8_t x0, uint8_t y0, uint8_t radius) {
+	circle(x0,y0,radius,foreColor,drawMode);
+}
+
+/** \brief Draw circle with color and mode.
+
+Draw circle with radius using color and mode at x,y of the screen buffer.
+*/
+void MicroOLED::circle(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color, uint8_t mode) {
+	//TODO - find a way to check for no overlapping of pixels so that XOR draw mode will work perfectly
+	int8_t f = 1 - radius;
+	int8_t ddF_x = 1;
+	int8_t ddF_y = -2 * radius;
+	int8_t x = 0;
+	int8_t y = radius;
+
+	pixel(x0, y0+radius, color, mode);
+	pixel(x0, y0-radius, color, mode);
+	pixel(x0+radius, y0, color, mode);
+	pixel(x0-radius, y0, color, mode);
+
+	while (x<y) {
+		if (f >= 0) {
+			y--;
+			ddF_y += 2;
+			f += ddF_y;
+		}
+		x++;
+		ddF_x += 2;
+		f += ddF_x;
+
+		pixel(x0 + x, y0 + y, color, mode);
+		pixel(x0 - x, y0 + y, color, mode);
+		pixel(x0 + x, y0 - y, color, mode);
+		pixel(x0 - x, y0 - y, color, mode);
+
+		pixel(x0 + y, y0 + x, color, mode);
+		pixel(x0 - y, y0 + x, color, mode);
+		pixel(x0 + y, y0 - x, color, mode);
+		pixel(x0 - y, y0 - x, color, mode);
+
+	}
+}
+
+/** \brief Draw filled circle.
+
+    Draw filled circle with radius using current fore color and current draw mode at x,y of the screen buffer.
+*/
+void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius) {
+	circleFill(x0,y0,radius,foreColor,drawMode);
+}
+
+/** \brief Draw filled circle with color and mode.
+
+    Draw filled circle with radius using color and mode at x,y of the screen buffer.
+*/
+void MicroOLED::circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color, uint8_t mode) {
+	// TODO - - find a way to check for no overlapping of pixels so that XOR draw mode will work perfectly
+	int8_t f = 1 - radius;
+	int8_t ddF_x = 1;
+	int8_t ddF_y = -2 * radius;
+	int8_t x = 0;
+	int8_t y = radius;
+
+	// Temporary disable fill circle for XOR mode.
+	if (mode==XOR) return;
+
+	for (uint8_t i=y0-radius; i<=y0+radius; i++) {
+		pixel(x0, i, color, mode);
+	}
+
+	while (x<y) {
+		if (f >= 0) {
+			y--;
+			ddF_y += 2;
+			f += ddF_y;
+		}
+		x++;
+		ddF_x += 2;
+		f += ddF_x;
+
+		for (uint8_t i=y0-y; i<=y0+y; i++) {
+			pixel(x0+x, i, color, mode);
+			pixel(x0-x, i, color, mode);
+		}
+		for (uint8_t i=y0-x; i<=y0+x; i++) {
+			pixel(x0+y, i, color, mode);
+			pixel(x0-y, i, color, mode);
+		}
+	}
+}
+
+/** \brief Get LCD height.
+
+    The height of the LCD return as byte.
+*/
+uint8_t MicroOLED::getLCDHeight(void) {
+	return LCDHEIGHT;
+}
+
+/** \brief Get LCD width.
+
+    The width of the LCD return as byte.
+*/
+uint8_t MicroOLED::getLCDWidth(void) {
+	return LCDWIDTH;
+}
+
+/** \brief Get font width.
+
+    The cucrrent font's width return as byte.
+*/
+uint8_t MicroOLED::getFontWidth(void) {
+	return fontWidth;
+}
+
+/** \brief Get font height.
+
+    The current font's height return as byte.
+*/
+uint8_t MicroOLED::getFontHeight(void) {
+	return fontHeight;
+}
+
+/** \brief Get font starting character.
+
+    Return the starting ASCII character of the currnet font, not all fonts start with ASCII character 0. Custom fonts can start from any ASCII character.
+*/
+uint8_t MicroOLED::getFontStartChar(void) {
+	return fontStartChar;
+}
+
+/** \brief Get font total characters.
+
+    Return the total characters of the current font.
+*/
+uint8_t MicroOLED::getFontTotalChar(void) {
+	return fontTotalChar;
+}
+
+/** \brief Get total fonts.
+
+    Return the total number of fonts loaded into the MicroOLED's flash memory.
+*/
+uint8_t MicroOLED::getTotalFonts(void) {
+	return TOTALFONTS;
+}
+
+/** \brief Get font type.
+
+    Return the font type number of the current font.
+*/
+uint8_t MicroOLED::getFontType(void) {
+	return fontType;
+}
+
+/** \brief Set font type.
+
+    Set the current font type number, ie changing to different fonts base on the type provided.
+*/
+uint8_t MicroOLED::setFontType(uint8_t type) {
+	if ((type>=TOTALFONTS) || (type<0))
+	return false;
+
+	fontType=type;
+	fontWidth=pgm_read_byte(fontsPointer[fontType]+0);
+	fontHeight=pgm_read_byte(fontsPointer[fontType]+1);
+	fontStartChar=pgm_read_byte(fontsPointer[fontType]+2);
+	fontTotalChar=pgm_read_byte(fontsPointer[fontType]+3);
+	fontMapWidth=(pgm_read_byte(fontsPointer[fontType]+4)*100)+pgm_read_byte(fontsPointer[fontType]+5); // two bytes values into integer 16
+	return true;
+}
+
+/** \brief Set color.
+
+    Set the current draw's color. Only WHITE and BLACK available.
+*/
+void MicroOLED::setColor(uint8_t color) {
+	foreColor=color;
+}
+
+/** \brief Set draw mode.
+
+    Set current draw mode with NORM or XOR.
+*/
+void MicroOLED::setDrawMode(uint8_t mode) {
+	drawMode=mode;
+}
+
+/** \brief Draw character.
+
+    Draw character c using current color and current draw mode at x,y.
+*/
+void  MicroOLED::drawChar(uint8_t x, uint8_t y, uint8_t c) {
+	drawChar(x,y,c,foreColor,drawMode);
+}
+
+/** \brief Draw character with color and mode.
+
+    Draw character c using color and draw mode at x,y.
+*/
+void  MicroOLED::drawChar(uint8_t x, uint8_t y, uint8_t c, uint8_t color, uint8_t mode) {
+	// TODO - New routine to take font of any height, at the moment limited to font height in multiple of 8 pixels
+
+	uint8_t rowsToDraw,row, tempC;
+	uint8_t i,j,temp;
+	uint16_t charPerBitmapRow,charColPositionOnBitmap,charRowPositionOnBitmap,charBitmapStartPosition;
+
+	if ((c<fontStartChar) || (c>(fontStartChar+fontTotalChar-1)))		// no bitmap for the required c
+	return;
+
+	tempC=c-fontStartChar;
+
+	// each row (in datasheet is call page) is 8 bits high, 16 bit high character will have 2 rows to be drawn
+	rowsToDraw=fontHeight/8;	// 8 is LCD's page size, see SSD1306 datasheet
+	if (rowsToDraw<=1) rowsToDraw=1;
+
+	// the following draw function can draw anywhere on the screen, but SLOW pixel by pixel draw
+	if (rowsToDraw==1) {
+		for  (i=0;i<fontWidth+1;i++) {
+			if (i==fontWidth) // this is done in a weird way because for 5x7 font, there is no margin, this code add a margin after col 5
+			temp=0;
+			else
+			temp=pgm_read_byte(fontsPointer[fontType]+FONTHEADERSIZE+(tempC*fontWidth)+i);
+
+			for (j=0;j<8;j++) {			// 8 is the LCD's page height (see datasheet for explanation)
+				if (temp & 0x1) {
+					pixel(x+i, y+j, color,mode);
+				}
+				else {
+					pixel(x+i, y+j, !color,mode);
+				}
+
+				temp >>=1;
+			}
+		}
+		return;
+	}
+
+	// font height over 8 bit
+	// take character "0" ASCII 48 as example
+	charPerBitmapRow=fontMapWidth/fontWidth;  // 256/8 =32 char per row
+	charColPositionOnBitmap=tempC % charPerBitmapRow;  // =16
+	charRowPositionOnBitmap=int(tempC/charPerBitmapRow); // =1
+	charBitmapStartPosition=(charRowPositionOnBitmap * fontMapWidth * (fontHeight/8)) + (charColPositionOnBitmap * fontWidth) ;
+
+	// each row on LCD is 8 bit height (see datasheet for explanation)
+	for(row=0;row<rowsToDraw;row++) {
+		for (i=0; i<fontWidth;i++) {
+			temp=pgm_read_byte(fontsPointer[fontType]+FONTHEADERSIZE+(charBitmapStartPosition+i+(row*fontMapWidth)));
+			for (j=0;j<8;j++) {			// 8 is the LCD's page height (see datasheet for explanation)
+				if (temp & 0x1) {
+					pixel(x+i,y+j+(row*8), color, mode);
+				}
+				else {
+					pixel(x+i,y+j+(row*8), !color, mode);
+				}
+				temp >>=1;
+			}
+		}
+	}
+
+}
+
+/** \brief Stop scrolling.
+
+    Stop the scrolling of graphics on the OLED.
+*/
+void MicroOLED::scrollStop(void){
+	command(DEACTIVATESCROLL);
+}
+
+/** \brief Right scrolling.
+
+Set row start to row stop on the OLED to scroll right. Refer to http://learn.microview.io/intro/general-overview-of-microview.html for explanation of the rows.
+*/
+void MicroOLED::scrollRight(uint8_t start, uint8_t stop){
+	if (stop<start)		// stop must be larger or equal to start
+	return;
+	scrollStop();		// need to disable scrolling before starting to avoid memory corrupt
+	command(RIGHTHORIZONTALSCROLL);
+	command(0x00);
+	command(start);
+	command(0x7);		// scroll speed frames , TODO
+	command(stop);
+	command(0x00);
+	command(0xFF);
+	command(ACTIVATESCROLL);
+}
+
+/** \brief Vertical flip.
+
+Flip the graphics on the OLED vertically.
+*/
+void MicroOLED::flipVertical(boolean flip) {
+	if (flip) {
+		command(COMSCANINC);
+	}
+	else {
+		command(COMSCANDEC);
+	}
+}
+
+/** \brief Horizontal flip.
+
+    Flip the graphics on the OLED horizontally.
+*/
+void MicroOLED::flipHorizontal(boolean flip) {
+	if (flip) {
+		command(SEGREMAP | 0x0);
+	}
+	else {
+		command(SEGREMAP | 0x1);
+	}
+}
+
+/*
+	Return a pointer to the start of the RAM screen buffer for direct access.
+*/
+uint8_t *MicroOLED::getScreenBuffer(void) {
+	return screenmemory;
+}
+
+/*
+Draw Bitmap image on screen. The array for the bitmap can be stored in the Arduino file, so user don't have to mess with the library files.
+To use, create uint8_t array that is 64x48 pixels (384 bytes). Then call .drawBitmap and pass it the array.
+*/
+void MicroOLED::drawBitmap(uint8_t * bitArray)
+{
+  for (int i=0; i<(LCDWIDTH * LCDHEIGHT / 8); i++)
+    screenmemory[i] = bitArray[i];
+}
diff --git a/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.h b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.h
index a14914a..820f7ba 100644
--- a/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.h
+++ b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.h
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <Arduino.h>
 #include <avr/pgmspace.h>
 
-#define swap(a, b) { uint8_t t = a; a = b; b = t; }
+#define swap(a, b) { float t = a; a = b; b = t; }
 
 #define I2C_ADDRESS_SA0_0 0b0111100
 #define I2C_ADDRESS_SA0_1 0b0111101
@@ -124,81 +124,81 @@ typedef enum COMM_MODE{
 class MicroOLED : public Print{
 public:
 	// Constructor(s)
-	MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs);
-	MicroOLED(uint8_t rst, uint8_t dc);
-	MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs, uint8_t wr, uint8_t rd, 
-			  uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3, 
-			  uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7);
+	MicroOLED(float rst, float dc, float cs);
+	MicroOLED(float rst, float dc);
+	MicroOLED(float rst, float dc, float cs, float wr, float rd, 
+			  float d0, float d1, float d2, float d3, 
+			  float d4, float d5, float d6, float d7);
 	
 	void begin(void);
 	virtual size_t write(uint8_t);
 
 	// RAW LCD functions
-	void command(uint8_t c);
-	void data(uint8_t c);
-	void setColumnAddress(uint8_t add);
-	void setPageAddress(uint8_t add);
+	void command(float c);
+	void data(float c);
+	void setColumnAddress(float add);
+	void setPageAddress(float add);
 	
 	// LCD Draw functions
-	void clear(uint8_t mode);
-	void clear(uint8_t mode, uint8_t c);
+	void clear(float mode);
+	void clear(float mode, float c);
 	void invert(boolean inv);
-	void contrast(uint8_t contrast);
+	void contrast(float contrast);
 	void display(void);
-	void setCursor(uint8_t x, uint8_t y);
-	void pixel(uint8_t x, uint8_t y);
-	void pixel(uint8_t x, uint8_t y, uint8_t color, uint8_t mode);
-	void line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1);
-	void line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t color, uint8_t mode);
-	void lineH(uint8_t x, uint8_t y, uint8_t width);
-	void lineH(uint8_t x, uint8_t y, uint8_t width, uint8_t color, uint8_t mode);
-	void lineV(uint8_t x, uint8_t y, uint8_t height);
-	void lineV(uint8_t x, uint8_t y, uint8_t height, uint8_t color, uint8_t mode);
-	void rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height);
-	void rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode);
-	void rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height);
-	void rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode);
-	void circle(uint8_t x, uint8_t y, uint8_t radius);
-	void circle(uint8_t x, uint8_t y, uint8_t radius, uint8_t color, uint8_t mode);
-	void circleFill(uint8_t x0, uint8_t y0, uint8_t radius);
-	void circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color, uint8_t mode);
-	void drawChar(uint8_t x, uint8_t y, uint8_t c);
-	void drawChar(uint8_t x, uint8_t y, uint8_t c, uint8_t color, uint8_t mode);
-	void drawBitmap(uint8_t * bitArray);
-	uint8_t getLCDWidth(void);
-	uint8_t getLCDHeight(void);
-	void setColor(uint8_t color);
-	void setDrawMode(uint8_t mode);
-	uint8_t *getScreenBuffer(void);
+	void setCursor(float x, float y);
+	void pixel(float x, float y);
+	void pixel(float x, float y, float color, float mode);
+	void line(float x0, float y0, float x1, float y1);
+	void line(float x0, float y0, float x1, float y1, float color, float mode);
+	void lineH(float x, float y, float width);
+	void lineH(float x, float y, float width, float color, float mode);
+	void lineV(float x, float y, float height);
+	void lineV(float x, float y, float height, float color, float mode);
+	void rect(float x, float y, float width, float height);
+	void rect(float x, float y, float width, float height, float color , float mode);
+	void rectFill(float x, float y, float width, float height);
+	void rectFill(float x, float y, float width, float height, float color , float mode);
+	void circle(float x, float y, float radius);
+	void circle(float x, float y, float radius, float color, float mode);
+	void circleFill(float x0, float y0, float radius);
+	void circleFill(float x0, float y0, float radius, float color, float mode);
+	void drawChar(float x, float y, float c);
+	void drawChar(float x, float y, float c, float color, float mode);
+	void drawBitmap(float * bitArray);
+	float getLCDWidth(void);
+	float getLCDHeight(void);
+	void setColor(float color);
+	void setDrawMode(float mode);
+	float *getScreenBuffer(void);
 
 	// Font functions
-	uint8_t getFontWidth(void);
-	uint8_t getFontHeight(void);
-	uint8_t getTotalFonts(void);
-	uint8_t getFontType(void);
-	uint8_t setFontType(uint8_t type);
-	uint8_t getFontStartChar(void);
-	uint8_t getFontTotalChar(void);
+	float getFontWidth(void);
+	float getFontHeight(void);
+	float getTotalFonts(void);
+	float getFontType(void);
+	float setFontType(float type);
+	float getFontStartChar(void);
+	float getFontTotalChar(void);
 
 	// LCD Rotate Scroll functions	
-	void scrollRight(uint8_t start, uint8_t stop);
-	void scrollLeft(uint8_t start, uint8_t stop);
-	void scrollVertRight(uint8_t start, uint8_t stop);
-	void scrollVertLeft(uint8_t start, uint8_t stop);
+	void scrollRight(float start, float stop);
+	void scrollLeft(float start, float stop);
+	void scrollVertRight(float start, float stop);
+	void scrollVertLeft(float start, float stop);
 	void scrollStop(void);
 	void flipVertical(boolean flip);
 	void flipHorizontal(boolean flip);
 	
 private:
-	uint8_t csPin, dcPin, rstPin;
-	uint8_t wrPin, rdPin, dPins[8];
-	volatile uint8_t *wrport, *wrreg, *rdport, *rdreg;
-	uint8_t wrpinmask, rdpinmask;
+	float csPin, dcPin, rstPin;
+	float wrPin, rdPin, dPins[8];
+	volatile float *wrport, *wrreg, *rdport, *rdreg;
+	float wrpinmask, rdpinmask;
 	micro_oled_mode interface;
 	byte i2c_address;
-	volatile uint8_t *ssport, *dcport, *ssreg, *dcreg;	// use volatile because these are fixed location port address
-	uint8_t mosipinmask, sckpinmask, sspinmask, dcpinmask;
-	uint8_t foreColor,drawMode,fontWidth, fontHeight, fontType, fontStartChar, fontTotalChar, cursorX, cursorY;
+	volatile float *ssport, *dcport, *ssreg, *dcreg;	// use volatile because these are fixed location port address
+	float mosipinmask, sckpinmask, sspinmask, dcpinmask;
+	float foreColor,drawMode,fontWidth, fontHeight, fontType, fontStartChar, fontTotalChar, cursorX, cursorY;
 	uint16_t fontMapWidth;
 	static const unsigned char *fontsPointer[];
 	
diff --git a/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.h.old b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.h.old
new file mode 100644
index 0000000..a14914a
--- /dev/null
+++ b/libraries/Micro_OLED_Breakout/src/SFE_MicroOLED.h.old
@@ -0,0 +1,213 @@
+/****************************************************************************** 
+SFE_MicroOLED.h
+Header file for the MicroOLED Arduino Library
+
+Jim Lindblom @ SparkFun Electronics
+October 26, 2014
+https://github.com/sparkfun/Micro_OLED_Breakout/tree/master/Firmware/Arduino/libraries/SFE_MicroOLED
+
+This file defines the hardware interface(s) for the Micro OLED Breakout. Those
+interfaces include SPI, I2C and a parallel bus.
+
+Development environment specifics:
+Arduino 1.0.5
+Arduino Pro 3.3V
+Micro OLED Breakout v1.0
+
+This code was heavily based around the MicroView library, written by GeekAmmo
+(https://github.com/geekammo/MicroView-Arduino-Library), and released under 
+the terms of the GNU General Public License as published by the Free Software 
+Foundation, either version 3 of the License, or (at your option) any later 
+version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#ifndef SFE_MICROOLED_H
+#define SFE_MICROOLED_H
+
+#include <stdio.h>
+#include <Arduino.h>
+#include <avr/pgmspace.h>
+
+#define swap(a, b) { uint8_t t = a; a = b; b = t; }
+
+#define I2C_ADDRESS_SA0_0 0b0111100
+#define I2C_ADDRESS_SA0_1 0b0111101
+#define I2C_COMMAND 0x00
+#define I2C_DATA 0x40
+
+#define BLACK 0
+#define WHITE 1
+
+#define LCDWIDTH			64
+#define LCDHEIGHT			48
+#define FONTHEADERSIZE		6
+
+#define NORM				0
+#define XOR					1
+
+#define PAGE				0
+#define ALL					1
+
+#define WIDGETSTYLE0			0
+#define WIDGETSTYLE1			1
+#define WIDGETSTYLE2			2
+
+#define SETCONTRAST 		0x81
+#define DISPLAYALLONRESUME 	0xA4
+#define DISPLAYALLON 		0xA5
+#define NORMALDISPLAY 		0xA6
+#define INVERTDISPLAY 		0xA7
+#define DISPLAYOFF 			0xAE
+#define DISPLAYON 			0xAF
+#define SETDISPLAYOFFSET 	0xD3
+#define SETCOMPINS 			0xDA
+#define SETVCOMDESELECT		0xDB
+#define SETDISPLAYCLOCKDIV 	0xD5
+#define SETPRECHARGE 		0xD9
+#define SETMULTIPLEX 		0xA8
+#define SETLOWCOLUMN 		0x00
+#define SETHIGHCOLUMN 		0x10
+#define SETSTARTLINE 		0x40
+#define MEMORYMODE 			0x20
+#define COMSCANINC 			0xC0
+#define COMSCANDEC 			0xC8
+#define SEGREMAP 			0xA0
+#define CHARGEPUMP 			0x8D
+#define EXTERNALVCC 		0x01
+#define SWITCHCAPVCC 		0x02
+
+// Scroll
+#define ACTIVATESCROLL 					0x2F
+#define DEACTIVATESCROLL 				0x2E
+#define SETVERTICALSCROLLAREA 			0xA3
+#define RIGHTHORIZONTALSCROLL 			0x26
+#define LEFT_HORIZONTALSCROLL 			0x27
+#define VERTICALRIGHTHORIZONTALSCROLL	0x29
+#define VERTICALLEFTHORIZONTALSCROLL	0x2A
+
+typedef enum CMD {
+	CMD_CLEAR,			//0
+	CMD_INVERT,			//1
+	CMD_CONTRAST,		//2
+	CMD_DISPLAY,		//3
+	CMD_SETCURSOR,		//4
+	CMD_PIXEL,			//5
+	CMD_LINE,			//6
+	CMD_LINEH,			//7
+	CMD_LINEV,			//8
+	CMD_RECT,			//9
+	CMD_RECTFILL,		//10
+	CMD_CIRCLE,			//11
+	CMD_CIRCLEFILL,		//12
+	CMD_DRAWCHAR,		//13
+	CMD_DRAWBITMAP,		//14
+	CMD_GETLCDWIDTH,	//15
+	CMD_GETLCDHEIGHT,	//16
+	CMD_SETCOLOR,		//17
+	CMD_SETDRAWMODE		//18
+} commCommand_t;
+
+typedef enum COMM_MODE{
+	MODE_SPI,
+	MODE_I2C,
+	MODE_PARALLEL
+} micro_oled_mode;
+
+class MicroOLED : public Print{
+public:
+	// Constructor(s)
+	MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs);
+	MicroOLED(uint8_t rst, uint8_t dc);
+	MicroOLED(uint8_t rst, uint8_t dc, uint8_t cs, uint8_t wr, uint8_t rd, 
+			  uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3, 
+			  uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7);
+	
+	void begin(void);
+	virtual size_t write(uint8_t);
+
+	// RAW LCD functions
+	void command(uint8_t c);
+	void data(uint8_t c);
+	void setColumnAddress(uint8_t add);
+	void setPageAddress(uint8_t add);
+	
+	// LCD Draw functions
+	void clear(uint8_t mode);
+	void clear(uint8_t mode, uint8_t c);
+	void invert(boolean inv);
+	void contrast(uint8_t contrast);
+	void display(void);
+	void setCursor(uint8_t x, uint8_t y);
+	void pixel(uint8_t x, uint8_t y);
+	void pixel(uint8_t x, uint8_t y, uint8_t color, uint8_t mode);
+	void line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1);
+	void line(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t color, uint8_t mode);
+	void lineH(uint8_t x, uint8_t y, uint8_t width);
+	void lineH(uint8_t x, uint8_t y, uint8_t width, uint8_t color, uint8_t mode);
+	void lineV(uint8_t x, uint8_t y, uint8_t height);
+	void lineV(uint8_t x, uint8_t y, uint8_t height, uint8_t color, uint8_t mode);
+	void rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height);
+	void rect(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode);
+	void rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height);
+	void rectFill(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t color , uint8_t mode);
+	void circle(uint8_t x, uint8_t y, uint8_t radius);
+	void circle(uint8_t x, uint8_t y, uint8_t radius, uint8_t color, uint8_t mode);
+	void circleFill(uint8_t x0, uint8_t y0, uint8_t radius);
+	void circleFill(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t color, uint8_t mode);
+	void drawChar(uint8_t x, uint8_t y, uint8_t c);
+	void drawChar(uint8_t x, uint8_t y, uint8_t c, uint8_t color, uint8_t mode);
+	void drawBitmap(uint8_t * bitArray);
+	uint8_t getLCDWidth(void);
+	uint8_t getLCDHeight(void);
+	void setColor(uint8_t color);
+	void setDrawMode(uint8_t mode);
+	uint8_t *getScreenBuffer(void);
+
+	// Font functions
+	uint8_t getFontWidth(void);
+	uint8_t getFontHeight(void);
+	uint8_t getTotalFonts(void);
+	uint8_t getFontType(void);
+	uint8_t setFontType(uint8_t type);
+	uint8_t getFontStartChar(void);
+	uint8_t getFontTotalChar(void);
+
+	// LCD Rotate Scroll functions	
+	void scrollRight(uint8_t start, uint8_t stop);
+	void scrollLeft(uint8_t start, uint8_t stop);
+	void scrollVertRight(uint8_t start, uint8_t stop);
+	void scrollVertLeft(uint8_t start, uint8_t stop);
+	void scrollStop(void);
+	void flipVertical(boolean flip);
+	void flipHorizontal(boolean flip);
+	
+private:
+	uint8_t csPin, dcPin, rstPin;
+	uint8_t wrPin, rdPin, dPins[8];
+	volatile uint8_t *wrport, *wrreg, *rdport, *rdreg;
+	uint8_t wrpinmask, rdpinmask;
+	micro_oled_mode interface;
+	byte i2c_address;
+	volatile uint8_t *ssport, *dcport, *ssreg, *dcreg;	// use volatile because these are fixed location port address
+	uint8_t mosipinmask, sckpinmask, sspinmask, dcpinmask;
+	uint8_t foreColor,drawMode,fontWidth, fontHeight, fontType, fontStartChar, fontTotalChar, cursorX, cursorY;
+	uint16_t fontMapWidth;
+	static const unsigned char *fontsPointer[];
+	
+	// Communication
+	void spiTransfer(byte data);
+	void spiSetup();
+	void i2cSetup();
+	void i2cWrite(byte address, byte control, byte data);
+	void parallelSetup();
+	void parallelWrite(byte data, byte dc);
+};
+#endif
diff --git a/libraries/OneWire/OneWire.cpp b/libraries/OneWire/OneWire.cpp
new file mode 100644
index 0000000..cf34933
--- /dev/null
+++ b/libraries/OneWire/OneWire.cpp
@@ -0,0 +1,567 @@
+/*
+Copyright (c) 2007, Jim Studt  (original old version - many contributors since)
+
+The latest version of this library may be found at:
+  http://www.pjrc.com/teensy/td_libs_OneWire.html
+
+OneWire has been maintained by Paul Stoffregen (paul@pjrc.com) since
+January 2010.  At the time, it was in need of many bug fixes, but had
+been abandoned the original author (Jim Studt).  None of the known
+contributors were interested in maintaining OneWire.  Paul typically
+works on OneWire every 6 to 12 months.  Patches usually wait that
+long.  If anyone is interested in more actively maintaining OneWire,
+please contact Paul.
+
+Version 2.3:
+  Unknonw chip fallback mode, Roger Clark
+  Teensy-LC compatibility, Paul Stoffregen
+  Search bug fix, Love Nystrom
+
+Version 2.2:
+  Teensy 3.0 compatibility, Paul Stoffregen, paul@pjrc.com
+  Arduino Due compatibility, http://arduino.cc/forum/index.php?topic=141030
+  Fix DS18B20 example negative temperature
+  Fix DS18B20 example's low res modes, Ken Butcher
+  Improve reset timing, Mark Tillotson
+  Add const qualifiers, Bertrik Sikken
+  Add initial value input to crc16, Bertrik Sikken
+  Add target_search() function, Scott Roberts
+
+Version 2.1:
+  Arduino 1.0 compatibility, Paul Stoffregen
+  Improve temperature example, Paul Stoffregen
+  DS250x_PROM example, Guillermo Lovato
+  PIC32 (chipKit) compatibility, Jason Dangel, dangel.jason AT gmail.com
+  Improvements from Glenn Trewitt:
+  - crc16() now works
+  - check_crc16() does all of calculation/checking work.
+  - Added read_bytes() and write_bytes(), to reduce tedious loops.
+  - Added ds2408 example.
+  Delete very old, out-of-date readme file (info is here)
+
+Version 2.0: Modifications by Paul Stoffregen, January 2010:
+http://www.pjrc.com/teensy/td_libs_OneWire.html
+  Search fix from Robin James
+    http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+  Use direct optimized I/O in all cases
+  Disable interrupts during timing critical sections
+    (this solves many random communication errors)
+  Disable interrupts during read-modify-write I/O
+  Reduce RAM consumption by eliminating unnecessary
+    variables and trimming many to 8 bits
+  Optimize both crc8 - table version moved to flash
+
+Modified to work with larger numbers of devices - avoids loop.
+Tested in Arduino 11 alpha with 12 sensors.
+26 Sept 2008 -- Robin James
+http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238032295/27#27
+
+Updated to work with arduino-0008 and to include skip() as of
+2007/07/06. --RJL20
+
+Modified to calculate the 8-bit CRC directly, avoiding the need for
+the 256-byte lookup table to be loaded in RAM.  Tested in arduino-0010
+-- Tom Pollard, Jan 23, 2008
+
+Jim Studt's original library was modified by Josh Larios.
+
+Tom Pollard, pollard@alum.mit.edu, contributed around May 20, 2008
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Much of the code was inspired by Derek Yerger's code, though I don't
+think much of that remains.  In any event that was..
+    (copyleft) 2006 by Derek Yerger - Free to distribute freely.
+
+The CRC code was excerpted and inspired by the Dallas Semiconductor
+sample code bearing this copyright.
+//---------------------------------------------------------------------------
+// Copyright (C) 2000 Dallas Semiconductor Corporation, All Rights Reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY,  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL DALLAS SEMICONDUCTOR BE LIABLE FOR ANY CLAIM, DAMAGES
+// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// Except as contained in this notice, the name of Dallas Semiconductor
+// shall not be used except as stated in the Dallas Semiconductor
+// Branding Policy.
+//--------------------------------------------------------------------------
+*/
+
+#include "OneWire.h"
+
+
+OneWire::OneWire(uint8_t pin)
+{
+	pinMode(pin, INPUT);
+	bitmask = PIN_TO_BITMASK(pin);
+	baseReg = PIN_TO_BASEREG(pin);
+#if ONEWIRE_SEARCH
+	reset_search();
+#endif
+}
+
+
+// Perform the onewire reset function.  We will wait up to 250uS for
+// the bus to come high, if it doesn't then it is broken or shorted
+// and we return a 0;
+//
+// Returns 1 if a device asserted a presence pulse, 0 otherwise.
+//
+uint8_t OneWire::reset(void)
+{
+	IO_REG_TYPE mask = bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_ASM = baseReg;
+	uint8_t r;
+	uint8_t retries = 125;
+
+	noInterrupts();
+	DIRECT_MODE_INPUT(reg, mask);
+	interrupts();
+	// wait until the wire is high... just in case
+	do {
+		if (--retries == 0) return 0;
+		delayMicroseconds(2);
+	} while ( !DIRECT_READ(reg, mask));
+
+	noInterrupts();
+	DIRECT_WRITE_LOW(reg, mask);
+	DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+	interrupts();
+	delayMicroseconds(480);
+	noInterrupts();
+	DIRECT_MODE_INPUT(reg, mask);	// allow it to float
+	delayMicroseconds(70);
+	r = !DIRECT_READ(reg, mask);
+	interrupts();
+	delayMicroseconds(410);
+	return r;
+}
+
+//
+// Write a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+void OneWire::write_bit(uint8_t v)
+{
+	IO_REG_TYPE mask=bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_ASM = baseReg;
+
+	if (v & 1) {
+		noInterrupts();
+		DIRECT_WRITE_LOW(reg, mask);
+		DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+		delayMicroseconds(10);
+		DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+		interrupts();
+		delayMicroseconds(55);
+	} else {
+		noInterrupts();
+		DIRECT_WRITE_LOW(reg, mask);
+		DIRECT_MODE_OUTPUT(reg, mask);	// drive output low
+		delayMicroseconds(65);
+		DIRECT_WRITE_HIGH(reg, mask);	// drive output high
+		interrupts();
+		delayMicroseconds(5);
+	}
+}
+
+//
+// Read a bit. Port and bit is used to cut lookup time and provide
+// more certain timing.
+//
+uint8_t OneWire::read_bit(void)
+{
+	IO_REG_TYPE mask=bitmask;
+	volatile IO_REG_TYPE *reg IO_REG_ASM = baseReg;
+	uint8_t r;
+
+	noInterrupts();
+	DIRECT_MODE_OUTPUT(reg, mask);
+	DIRECT_WRITE_LOW(reg, mask);
+	delayMicroseconds(3);
+	DIRECT_MODE_INPUT(reg, mask);	// let pin float, pull up will raise
+	delayMicroseconds(10);
+	r = DIRECT_READ(reg, mask);
+	interrupts();
+	delayMicroseconds(53);
+	return r;
+}
+
+//
+// Write a byte. The writing code uses the active drivers to raise the
+// pin high, if you need power after the write (e.g. DS18S20 in
+// parasite power mode) then set 'power' to 1, otherwise the pin will
+// go tri-state at the end of the write to avoid heating in a short or
+// other mishap.
+//
+void OneWire::write(uint8_t v, uint8_t power /* = 0 */) {
+    uint8_t bitMask;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+	OneWire::write_bit( (bitMask & v)?1:0);
+    }
+    if ( !power) {
+	noInterrupts();
+	DIRECT_MODE_INPUT(baseReg, bitmask);
+	DIRECT_WRITE_LOW(baseReg, bitmask);
+	interrupts();
+    }
+}
+
+void OneWire::write_bytes(const uint8_t *buf, uint16_t count, bool power /* = 0 */) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    write(buf[i]);
+  if (!power) {
+    noInterrupts();
+    DIRECT_MODE_INPUT(baseReg, bitmask);
+    DIRECT_WRITE_LOW(baseReg, bitmask);
+    interrupts();
+  }
+}
+
+//
+// Read a byte
+//
+uint8_t OneWire::read() {
+    uint8_t bitMask;
+    uint8_t r = 0;
+
+    for (bitMask = 0x01; bitMask; bitMask <<= 1) {
+	if ( OneWire::read_bit()) r |= bitMask;
+    }
+    return r;
+}
+
+void OneWire::read_bytes(uint8_t *buf, uint16_t count) {
+  for (uint16_t i = 0 ; i < count ; i++)
+    buf[i] = read();
+}
+
+//
+// Do a ROM select
+//
+void OneWire::select(const uint8_t rom[8])
+{
+    uint8_t i;
+
+    write(0x55);           // Choose ROM
+
+    for (i = 0; i < 8; i++) write(rom[i]);
+}
+
+//
+// Do a ROM skip
+//
+void OneWire::skip()
+{
+    write(0xCC);           // Skip ROM
+}
+
+void OneWire::depower()
+{
+	noInterrupts();
+	DIRECT_MODE_INPUT(baseReg, bitmask);
+	interrupts();
+}
+
+#if ONEWIRE_SEARCH
+
+//
+// You need to use this function to start a search again from the beginning.
+// You do not need to do it for the first search, though you could.
+//
+void OneWire::reset_search()
+{
+  // reset the search state
+  LastDiscrepancy = 0;
+  LastDeviceFlag = FALSE;
+  LastFamilyDiscrepancy = 0;
+  for(int i = 7; ; i--) {
+    ROM_NO[i] = 0;
+    if ( i == 0) break;
+  }
+}
+
+// Setup the search to find the device type 'family_code' on the next call
+// to search(*newAddr) if it is present.
+//
+void OneWire::target_search(uint8_t family_code)
+{
+   // set the search state to find SearchFamily type devices
+   ROM_NO[0] = family_code;
+   for (uint8_t i = 1; i < 8; i++)
+      ROM_NO[i] = 0;
+   LastDiscrepancy = 64;
+   LastFamilyDiscrepancy = 0;
+   LastDeviceFlag = FALSE;
+}
+
+//
+// Perform a search. If this function returns a '1' then it has
+// enumerated the next device and you may retrieve the ROM from the
+// OneWire::address variable. If there are no devices, no further
+// devices, or something horrible happens in the middle of the
+// enumeration then a 0 is returned.  If a new device is found then
+// its address is copied to newAddr.  Use OneWire::reset_search() to
+// start over.
+//
+// --- Replaced by the one from the Dallas Semiconductor web site ---
+//--------------------------------------------------------------------------
+// Perform the 1-Wire Search Algorithm on the 1-Wire bus using the existing
+// search state.
+// Return TRUE  : device found, ROM number in ROM_NO buffer
+//        FALSE : device not found, end of search
+//
+uint8_t OneWire::search(uint8_t *newAddr, bool search_mode /* = true */)
+{
+   uint8_t id_bit_number;
+   uint8_t last_zero, rom_byte_number, search_result;
+   uint8_t id_bit, cmp_id_bit;
+
+   unsigned char rom_byte_mask, search_direction;
+
+   // initialize for search
+   id_bit_number = 1;
+   last_zero = 0;
+   rom_byte_number = 0;
+   rom_byte_mask = 1;
+   search_result = 0;
+
+   // if the last call was not the last one
+   if (!LastDeviceFlag)
+   {
+      // 1-Wire reset
+      if (!reset())
+      {
+         // reset the search
+         LastDiscrepancy = 0;
+         LastDeviceFlag = FALSE;
+         LastFamilyDiscrepancy = 0;
+         return FALSE;
+      }
+
+      // issue the search command
+      if (search_mode == true) {
+        write(0xF0);   // NORMAL SEARCH
+      } else {
+        write(0xEC);   // CONDITIONAL SEARCH
+      }
+
+      // loop to do the search
+      do
+      {
+         // read a bit and its complement
+         id_bit = read_bit();
+         cmp_id_bit = read_bit();
+
+         // check for no devices on 1-wire
+         if ((id_bit == 1) && (cmp_id_bit == 1))
+            break;
+         else
+         {
+            // all devices coupled have 0 or 1
+            if (id_bit != cmp_id_bit)
+               search_direction = id_bit;  // bit write value for search
+            else
+            {
+               // if this discrepancy if before the Last Discrepancy
+               // on a previous next then pick the same as last time
+               if (id_bit_number < LastDiscrepancy)
+                  search_direction = ((ROM_NO[rom_byte_number] & rom_byte_mask) > 0);
+               else
+                  // if equal to last pick 1, if not then pick 0
+                  search_direction = (id_bit_number == LastDiscrepancy);
+
+               // if 0 was picked then record its position in LastZero
+               if (search_direction == 0)
+               {
+                  last_zero = id_bit_number;
+
+                  // check for Last discrepancy in family
+                  if (last_zero < 9)
+                     LastFamilyDiscrepancy = last_zero;
+               }
+            }
+
+            // set or clear the bit in the ROM byte rom_byte_number
+            // with mask rom_byte_mask
+            if (search_direction == 1)
+              ROM_NO[rom_byte_number] |= rom_byte_mask;
+            else
+              ROM_NO[rom_byte_number] &= ~rom_byte_mask;
+
+            // serial number search direction write bit
+            write_bit(search_direction);
+
+            // increment the byte counter id_bit_number
+            // and shift the mask rom_byte_mask
+            id_bit_number++;
+            rom_byte_mask <<= 1;
+
+            // if the mask is 0 then go to new SerialNum byte rom_byte_number and reset mask
+            if (rom_byte_mask == 0)
+            {
+                rom_byte_number++;
+                rom_byte_mask = 1;
+            }
+         }
+      }
+      while(rom_byte_number < 8);  // loop until through all ROM bytes 0-7
+
+      // if the search was successful then
+      if (!(id_bit_number < 65))
+      {
+         // search successful so set LastDiscrepancy,LastDeviceFlag,search_result
+         LastDiscrepancy = last_zero;
+
+         // check for last device
+         if (LastDiscrepancy == 0)
+            LastDeviceFlag = TRUE;
+
+         search_result = TRUE;
+      }
+   }
+
+   // if no device found then reset counters so next 'search' will be like a first
+   if (!search_result || !ROM_NO[0])
+   {
+      LastDiscrepancy = 0;
+      LastDeviceFlag = FALSE;
+      LastFamilyDiscrepancy = 0;
+      search_result = FALSE;
+   } else {
+      for (int i = 0; i < 8; i++) newAddr[i] = ROM_NO[i];
+   }
+   return search_result;
+  }
+
+#endif
+
+#if ONEWIRE_CRC
+// The 1-Wire CRC scheme is described in Maxim Application Note 27:
+// "Understanding and Using Cyclic Redundancy Checks with Maxim iButton Products"
+//
+
+#if ONEWIRE_CRC8_TABLE
+// This table comes from Dallas sample code where it is freely reusable,
+// though Copyright (C) 2000 Dallas Semiconductor Corporation
+static const uint8_t PROGMEM dscrc_table[] = {
+      0, 94,188,226, 97, 63,221,131,194,156,126, 32,163,253, 31, 65,
+    157,195, 33,127,252,162, 64, 30, 95,  1,227,189, 62, 96,130,220,
+     35,125,159,193, 66, 28,254,160,225,191, 93,  3,128,222, 60, 98,
+    190,224,  2, 92,223,129, 99, 61,124, 34,192,158, 29, 67,161,255,
+     70, 24,250,164, 39,121,155,197,132,218, 56,102,229,187, 89,  7,
+    219,133,103, 57,186,228,  6, 88, 25, 71,165,251,120, 38,196,154,
+    101, 59,217,135,  4, 90,184,230,167,249, 27, 69,198,152,122, 36,
+    248,166, 68, 26,153,199, 37,123, 58,100,134,216, 91,  5,231,185,
+    140,210, 48,110,237,179, 81, 15, 78, 16,242,172, 47,113,147,205,
+     17, 79,173,243,112, 46,204,146,211,141,111, 49,178,236, 14, 80,
+    175,241, 19, 77,206,144,114, 44,109, 51,209,143, 12, 82,176,238,
+     50,108,142,208, 83, 13,239,177,240,174, 76, 18,145,207, 45,115,
+    202,148,118, 40,171,245, 23, 73,  8, 86,180,234,105, 55,213,139,
+     87,  9,235,181, 54,104,138,212,149,203, 41,119,244,170, 72, 22,
+    233,183, 85, 11,136,214, 52,106, 43,117,151,201, 74, 20,246,168,
+    116, 42,200,150, 21, 75,169,247,182,232, 10, 84,215,137,107, 53};
+
+//
+// Compute a Dallas Semiconductor 8 bit CRC. These show up in the ROM
+// and the registers.  (note: this might better be done without to
+// table, it would probably be smaller and certainly fast enough
+// compared to all those delayMicrosecond() calls.  But I got
+// confused, so I use this table from the examples.)
+//
+uint8_t OneWire::crc8(const uint8_t *addr, uint8_t len)
+{
+	uint8_t crc = 0;
+
+	while (len--) {
+		crc = pgm_read_byte(dscrc_table + (crc ^ *addr++));
+	}
+	return crc;
+}
+#else
+//
+// Compute a Dallas Semiconductor 8 bit CRC directly.
+// this is much slower, but much smaller, than the lookup table.
+//
+uint8_t OneWire::crc8(const uint8_t *addr, uint8_t len)
+{
+	uint8_t crc = 0;
+	
+	while (len--) {
+		uint8_t inbyte = *addr++;
+		for (uint8_t i = 8; i; i--) {
+			uint8_t mix = (crc ^ inbyte) & 0x01;
+			crc >>= 1;
+			if (mix) crc ^= 0x8C;
+			inbyte >>= 1;
+		}
+	}
+	return crc;
+}
+#endif
+
+#if ONEWIRE_CRC16
+bool OneWire::check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc)
+{
+    crc = ~crc16(input, len, crc);
+    return (crc & 0xFF) == inverted_crc[0] && (crc >> 8) == inverted_crc[1];
+}
+
+uint16_t OneWire::crc16(const uint8_t* input, uint16_t len, uint16_t crc)
+{
+    static const uint8_t oddparity[16] =
+        { 0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0 };
+
+    for (uint16_t i = 0 ; i < len ; i++) {
+      // Even though we're just copying a byte from the input,
+      // we'll be doing 16-bit computation with it.
+      uint16_t cdata = input[i];
+      cdata = (cdata ^ crc) & 0xff;
+      crc >>= 8;
+
+      if (oddparity[cdata & 0x0F] ^ oddparity[cdata >> 4])
+          crc ^= 0xC001;
+
+      cdata <<= 6;
+      crc ^= cdata;
+      cdata <<= 1;
+      crc ^= cdata;
+    }
+    return crc;
+}
+#endif
+
+#endif
diff --git a/libraries/OneWire/OneWire.h b/libraries/OneWire/OneWire.h
new file mode 100644
index 0000000..8753e91
--- /dev/null
+++ b/libraries/OneWire/OneWire.h
@@ -0,0 +1,367 @@
+#ifndef OneWire_h
+#define OneWire_h
+
+#include <inttypes.h>
+
+#if ARDUINO >= 100
+#include "Arduino.h"       // for delayMicroseconds, digitalPinToBitMask, etc
+#else
+#include "WProgram.h"      // for delayMicroseconds
+#include "pins_arduino.h"  // for digitalPinToBitMask, etc
+#endif
+
+// You can exclude certain features from OneWire.  In theory, this
+// might save some space.  In practice, the compiler automatically
+// removes unused code (technically, the linker, using -fdata-sections
+// and -ffunction-sections when compiling, and Wl,--gc-sections
+// when linking), so most of these will not result in any code size
+// reduction.  Well, unless you try to use the missing features
+// and redesign your program to not need them!  ONEWIRE_CRC8_TABLE
+// is the exception, because it selects a fast but large algorithm
+// or a small but slow algorithm.
+
+// you can exclude onewire_search by defining that to 0
+#ifndef ONEWIRE_SEARCH
+#define ONEWIRE_SEARCH 1
+#endif
+
+// You can exclude CRC checks altogether by defining this to 0
+#ifndef ONEWIRE_CRC
+#define ONEWIRE_CRC 1
+#endif
+
+// Select the table-lookup method of computing the 8-bit CRC
+// by setting this to 1.  The lookup table enlarges code size by
+// about 250 bytes.  It does NOT consume RAM (but did in very
+// old versions of OneWire).  If you disable this, a slower
+// but very compact algorithm is used.
+#ifndef ONEWIRE_CRC8_TABLE
+#define ONEWIRE_CRC8_TABLE 1
+#endif
+
+// You can allow 16-bit CRC checks by defining this to 1
+// (Note that ONEWIRE_CRC must also be 1.)
+#ifndef ONEWIRE_CRC16
+#define ONEWIRE_CRC16 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE  1
+#endif
+
+// Platform specific I/O definitions
+
+#if defined(__AVR__)
+#define PIN_TO_BASEREG(pin)             (portInputRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint8_t
+#define IO_REG_ASM asm("r30")
+#define DIRECT_READ(base, mask)         (((*(base)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+1)) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+1)) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+2)) &= ~(mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+2)) |= (mask))
+
+#elif defined(__MK20DX128__) || defined(__MK20DX256__) || defined(__MK66FX1M0__) || defined(__MK64FX512__)
+#define PIN_TO_BASEREG(pin)             (portOutputRegister(pin))
+#define PIN_TO_BITMASK(pin)             (1)
+#define IO_REG_TYPE uint8_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (*((base)+512))
+#define DIRECT_MODE_INPUT(base, mask)   (*((base)+640) = 0)
+#define DIRECT_MODE_OUTPUT(base, mask)  (*((base)+640) = 1)
+#define DIRECT_WRITE_LOW(base, mask)    (*((base)+256) = 1)
+#define DIRECT_WRITE_HIGH(base, mask)   (*((base)+128) = 1)
+
+#elif defined(__MKL26Z64__)
+#define PIN_TO_BASEREG(pin)             (portOutputRegister(pin))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint8_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         ((*((base)+16) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   (*((base)+20) &= ~(mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  (*((base)+20) |= (mask))
+#define DIRECT_WRITE_LOW(base, mask)    (*((base)+8) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   (*((base)+4) = (mask))
+
+#elif defined(__SAM3X8E__)
+// Arduino 1.5.1 may have a bug in delayMicroseconds() on Arduino Due.
+// http://arduino.cc/forum/index.php/topic,141030.msg1076268.html#msg1076268
+// If you have trouble with OneWire on Arduino Due, please check the
+// status of delayMicroseconds() before reporting a bug in OneWire!
+#define PIN_TO_BASEREG(pin)             (&(digitalPinToPort(pin)->PIO_PER))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (((*((base)+15)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+5)) = (mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+4)) = (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+13)) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+12)) = (mask))
+#ifndef PROGMEM
+#define PROGMEM
+#endif
+#ifndef pgm_read_byte
+#define pgm_read_byte(addr) (*(const uint8_t *)(addr))
+#endif
+
+#elif defined(__PIC32MX__)
+#define PIN_TO_BASEREG(pin)             (portModeRegister(digitalPinToPort(pin)))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (((*(base+4)) & (mask)) ? 1 : 0)  //PORTX + 0x10
+#define DIRECT_MODE_INPUT(base, mask)   ((*(base+2)) = (mask))            //TRISXSET + 0x08
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*(base+1)) = (mask))            //TRISXCLR + 0x04
+#define DIRECT_WRITE_LOW(base, mask)    ((*(base+8+1)) = (mask))          //LATXCLR  + 0x24
+#define DIRECT_WRITE_HIGH(base, mask)   ((*(base+8+2)) = (mask))          //LATXSET + 0x28
+
+#elif defined(ARDUINO_ARCH_ESP8266)
+#define PIN_TO_BASEREG(pin)             ((volatile uint32_t*) GPO)
+#define PIN_TO_BITMASK(pin)             (1 << pin)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         ((GPI & (mask)) ? 1 : 0)    //GPIO_IN_ADDRESS
+#define DIRECT_MODE_INPUT(base, mask)   (GPE &= ~(mask))            //GPIO_ENABLE_W1TC_ADDRESS
+#define DIRECT_MODE_OUTPUT(base, mask)  (GPE |= (mask))             //GPIO_ENABLE_W1TS_ADDRESS
+#define DIRECT_WRITE_LOW(base, mask)    (GPOC = (mask))             //GPIO_OUT_W1TC_ADDRESS
+#define DIRECT_WRITE_HIGH(base, mask)   (GPOS = (mask))             //GPIO_OUT_W1TS_ADDRESS
+
+#elif defined(__SAMD21G18A__)
+#define PIN_TO_BASEREG(pin)             portModeRegister(digitalPinToPort(pin))
+#define PIN_TO_BITMASK(pin)             (digitalPinToBitMask(pin))
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, mask)         (((*((base)+8)) & (mask)) ? 1 : 0)
+#define DIRECT_MODE_INPUT(base, mask)   ((*((base)+1)) = (mask))
+#define DIRECT_MODE_OUTPUT(base, mask)  ((*((base)+2)) = (mask))
+#define DIRECT_WRITE_LOW(base, mask)    ((*((base)+5)) = (mask))
+#define DIRECT_WRITE_HIGH(base, mask)   ((*((base)+6)) = (mask))
+
+#elif defined(RBL_NRF51822)
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             (pin)
+#define IO_REG_TYPE uint32_t
+#define IO_REG_ASM
+#define DIRECT_READ(base, pin)          nrf_gpio_pin_read(pin)
+#define DIRECT_WRITE_LOW(base, pin)     nrf_gpio_pin_clear(pin)
+#define DIRECT_WRITE_HIGH(base, pin)    nrf_gpio_pin_set(pin)
+#define DIRECT_MODE_INPUT(base, pin)    nrf_gpio_cfg_input(pin, NRF_GPIO_PIN_NOPULL)
+#define DIRECT_MODE_OUTPUT(base, pin)   nrf_gpio_cfg_output(pin)
+
+#elif defined(__arc__) /* Arduino101/Genuino101 specifics */
+
+#include "scss_registers.h"
+#include "portable.h"
+#include "avr/pgmspace.h"
+
+#define GPIO_ID(pin)			(g_APinDescription[pin].ulGPIOId)
+#define GPIO_TYPE(pin)			(g_APinDescription[pin].ulGPIOType)
+#define GPIO_BASE(pin)			(g_APinDescription[pin].ulGPIOBase)
+#define DIR_OFFSET_SS			0x01
+#define DIR_OFFSET_SOC			0x04
+#define EXT_PORT_OFFSET_SS		0x0A
+#define EXT_PORT_OFFSET_SOC		0x50
+
+/* GPIO registers base address */
+#define PIN_TO_BASEREG(pin)		((volatile uint32_t *)g_APinDescription[pin].ulGPIOBase)
+#define PIN_TO_BITMASK(pin)		pin
+#define IO_REG_TYPE			uint32_t
+#define IO_REG_ASM
+
+static inline __attribute__((always_inline))
+IO_REG_TYPE directRead(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    IO_REG_TYPE ret;
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        ret = READ_ARC_REG(((IO_REG_TYPE)base + EXT_PORT_OFFSET_SS));
+    } else {
+        ret = MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, EXT_PORT_OFFSET_SOC);
+    }
+    return ((ret >> GPIO_ID(pin)) & 0x01);
+}
+
+static inline __attribute__((always_inline))
+void directModeInput(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG((((IO_REG_TYPE)base) + DIR_OFFSET_SS)) & ~(0x01 << GPIO_ID(pin)),
+			((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
+    } else {
+        MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) &= ~(0x01 << GPIO_ID(pin));
+    }
+}
+
+static inline __attribute__((always_inline))
+void directModeOutput(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG(((IO_REG_TYPE)(base) + DIR_OFFSET_SS)) | (0x01 << GPIO_ID(pin)),
+			((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
+    } else {
+        MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) |= (0x01 << GPIO_ID(pin));
+    }
+}
+
+static inline __attribute__((always_inline))
+void directWriteLow(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG(base) & ~(0x01 << GPIO_ID(pin)), base);
+    } else {
+        MMIO_REG_VAL(base) &= ~(0x01 << GPIO_ID(pin));
+    }
+}
+
+static inline __attribute__((always_inline))
+void directWriteHigh(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
+{
+    if (SS_GPIO == GPIO_TYPE(pin)) {
+        WRITE_ARC_REG(READ_ARC_REG(base) | (0x01 << GPIO_ID(pin)), base);
+    } else {
+        MMIO_REG_VAL(base) |= (0x01 << GPIO_ID(pin));
+    }
+}
+
+#define DIRECT_READ(base, pin)		directRead(base, pin)
+#define DIRECT_MODE_INPUT(base, pin)	directModeInput(base, pin)
+#define DIRECT_MODE_OUTPUT(base, pin)	directModeOutput(base, pin)
+#define DIRECT_WRITE_LOW(base, pin)	directWriteLow(base, pin)
+#define DIRECT_WRITE_HIGH(base, pin)	directWriteHigh(base, pin)
+
+#else
+#define PIN_TO_BASEREG(pin)             (0)
+#define PIN_TO_BITMASK(pin)             (pin)
+#define IO_REG_TYPE unsigned int
+#define IO_REG_ASM
+#define DIRECT_READ(base, pin)          digitalRead(pin)
+#define DIRECT_WRITE_LOW(base, pin)     digitalWrite(pin, LOW)
+#define DIRECT_WRITE_HIGH(base, pin)    digitalWrite(pin, HIGH)
+#define DIRECT_MODE_INPUT(base, pin)    pinMode(pin,INPUT)
+#define DIRECT_MODE_OUTPUT(base, pin)   pinMode(pin,OUTPUT)
+#warning "OneWire. Fallback mode. Using API calls for pinMode,digitalRead and digitalWrite. Operation of this library is not guaranteed on this architecture."
+
+#endif
+
+
+class OneWire
+{
+  private:
+    IO_REG_TYPE bitmask;
+    volatile IO_REG_TYPE *baseReg;
+
+#if ONEWIRE_SEARCH
+    // global search state
+    unsigned char ROM_NO[8];
+    uint8_t LastDiscrepancy;
+    uint8_t LastFamilyDiscrepancy;
+    uint8_t LastDeviceFlag;
+#endif
+
+  public:
+    OneWire( uint8_t pin);
+
+    // Perform a 1-Wire reset cycle. Returns 1 if a device responds
+    // with a presence pulse.  Returns 0 if there is no device or the
+    // bus is shorted or otherwise held low for more than 250uS
+    uint8_t reset(void);
+
+    // Issue a 1-Wire rom select command, you do the reset first.
+    void select(const uint8_t rom[8]);
+
+    // Issue a 1-Wire rom skip command, to address all on bus.
+    void skip(void);
+
+    // Write a byte. If 'power' is one then the wire is held high at
+    // the end for parasitically powered devices. You are responsible
+    // for eventually depowering it by calling depower() or doing
+    // another read or write.
+    void write(uint8_t v, uint8_t power = 0);
+
+    void write_bytes(const uint8_t *buf, uint16_t count, bool power = 0);
+
+    // Read a byte.
+    uint8_t read(void);
+
+    void read_bytes(uint8_t *buf, uint16_t count);
+
+    // Write a bit. The bus is always left powered at the end, see
+    // note in write() about that.
+    void write_bit(uint8_t v);
+
+    // Read a bit.
+    uint8_t read_bit(void);
+
+    // Stop forcing power onto the bus. You only need to do this if
+    // you used the 'power' flag to write() or used a write_bit() call
+    // and aren't about to do another read or write. You would rather
+    // not leave this powered if you don't have to, just in case
+    // someone shorts your bus.
+    void depower(void);
+
+#if ONEWIRE_SEARCH
+    // Clear the search state so that if will start from the beginning again.
+    void reset_search();
+
+    // Setup the search to find the device type 'family_code' on the next call
+    // to search(*newAddr) if it is present.
+    void target_search(uint8_t family_code);
+
+    // Look for the next device. Returns 1 if a new address has been
+    // returned. A zero might mean that the bus is shorted, there are
+    // no devices, or you have already retrieved all of them.  It
+    // might be a good idea to check the CRC to make sure you didn't
+    // get garbage.  The order is deterministic. You will always get
+    // the same devices in the same order.
+    uint8_t search(uint8_t *newAddr, bool search_mode = true);
+#endif
+
+#if ONEWIRE_CRC
+    // Compute a Dallas Semiconductor 8 bit CRC, these are used in the
+    // ROM and scratchpad registers.
+    static uint8_t crc8(const uint8_t *addr, uint8_t len);
+
+#if ONEWIRE_CRC16
+    // Compute the 1-Wire CRC16 and compare it against the received CRC.
+    // Example usage (reading a DS2408):
+    //    // Put everything in a buffer so we can compute the CRC easily.
+    //    uint8_t buf[13];
+    //    buf[0] = 0xF0;    // Read PIO Registers
+    //    buf[1] = 0x88;    // LSB address
+    //    buf[2] = 0x00;    // MSB address
+    //    WriteBytes(net, buf, 3);    // Write 3 cmd bytes
+    //    ReadBytes(net, buf+3, 10);  // Read 6 data bytes, 2 0xFF, 2 CRC16
+    //    if (!CheckCRC16(buf, 11, &buf[11])) {
+    //        // Handle error.
+    //    }     
+    //          
+    // @param input - Array of bytes to checksum.
+    // @param len - How many bytes to use.
+    // @param inverted_crc - The two CRC16 bytes in the received data.
+    //                       This should just point into the received data,
+    //                       *not* at a 16-bit integer.
+    // @param crc - The crc starting value (optional)
+    // @return True, iff the CRC matches.
+    static bool check_crc16(const uint8_t* input, uint16_t len, const uint8_t* inverted_crc, uint16_t crc = 0);
+
+    // Compute a Dallas Semiconductor 16 bit CRC.  This is required to check
+    // the integrity of data received from many 1-Wire devices.  Note that the
+    // CRC computed here is *not* what you'll get from the 1-Wire network,
+    // for two reasons:
+    //   1) The CRC is transmitted bitwise inverted.
+    //   2) Depending on the endian-ness of your processor, the binary
+    //      representation of the two-byte return value may have a different
+    //      byte order than the two bytes you get from 1-Wire.
+    // @param input - Array of bytes to checksum.
+    // @param len - How many bytes to use.
+    // @param crc - The crc starting value (optional)
+    // @return The CRC16, as defined by Dallas Semiconductor.
+    static uint16_t crc16(const uint8_t* input, uint16_t len, uint16_t crc = 0);
+#endif
+#endif
+};
+
+#endif
diff --git a/libraries/OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde b/libraries/OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde
new file mode 100644
index 0000000..68ca194
--- /dev/null
+++ b/libraries/OneWire/examples/DS18x20_Temperature/DS18x20_Temperature.pde
@@ -0,0 +1,112 @@
+#include <OneWire.h>
+
+// OneWire DS18S20, DS18B20, DS1822 Temperature Example
+//
+// http://www.pjrc.com/teensy/td_libs_OneWire.html
+//
+// The DallasTemperature library can do all this work for you!
+// http://milesburton.com/Dallas_Temperature_Control_Library
+
+OneWire  ds(10);  // on pin 10 (a 4.7K resistor is necessary)
+
+void setup(void) {
+  Serial.begin(9600);
+}
+
+void loop(void) {
+  byte i;
+  byte present = 0;
+  byte type_s;
+  byte data[12];
+  byte addr[8];
+  float celsius, fahrenheit;
+  
+  if ( !ds.search(addr)) {
+    Serial.println("No more addresses.");
+    Serial.println();
+    ds.reset_search();
+    delay(250);
+    return;
+  }
+  
+  Serial.print("ROM =");
+  for( i = 0; i < 8; i++) {
+    Serial.write(' ');
+    Serial.print(addr[i], HEX);
+  }
+
+  if (OneWire::crc8(addr, 7) != addr[7]) {
+      Serial.println("CRC is not valid!");
+      return;
+  }
+  Serial.println();
+ 
+  // the first ROM byte indicates which chip
+  switch (addr[0]) {
+    case 0x10:
+      Serial.println("  Chip = DS18S20");  // or old DS1820
+      type_s = 1;
+      break;
+    case 0x28:
+      Serial.println("  Chip = DS18B20");
+      type_s = 0;
+      break;
+    case 0x22:
+      Serial.println("  Chip = DS1822");
+      type_s = 0;
+      break;
+    default:
+      Serial.println("Device is not a DS18x20 family device.");
+      return;
+  } 
+
+  ds.reset();
+  ds.select(addr);
+  ds.write(0x44, 1);        // start conversion, with parasite power on at the end
+  
+  delay(1000);     // maybe 750ms is enough, maybe not
+  // we might do a ds.depower() here, but the reset will take care of it.
+  
+  present = ds.reset();
+  ds.select(addr);    
+  ds.write(0xBE);         // Read Scratchpad
+
+  Serial.print("  Data = ");
+  Serial.print(present, HEX);
+  Serial.print(" ");
+  for ( i = 0; i < 9; i++) {           // we need 9 bytes
+    data[i] = ds.read();
+    Serial.print(data[i], HEX);
+    Serial.print(" ");
+  }
+  Serial.print(" CRC=");
+  Serial.print(OneWire::crc8(data, 8), HEX);
+  Serial.println();
+
+  // Convert the data to actual temperature
+  // because the result is a 16 bit signed integer, it should
+  // be stored to an "int16_t" type, which is always 16 bits
+  // even when compiled on a 32 bit processor.
+  int16_t raw = (data[1] << 8) | data[0];
+  if (type_s) {
+    raw = raw << 3; // 9 bit resolution default
+    if (data[7] == 0x10) {
+      // "count remain" gives full 12 bit resolution
+      raw = (raw & 0xFFF0) + 12 - data[6];
+    }
+  } else {
+    byte cfg = (data[4] & 0x60);
+    // at lower res, the low bits are undefined, so let's zero them
+    if (cfg == 0x00) raw = raw & ~7;  // 9 bit resolution, 93.75 ms
+    else if (cfg == 0x20) raw = raw & ~3; // 10 bit res, 187.5 ms
+    else if (cfg == 0x40) raw = raw & ~1; // 11 bit res, 375 ms
+    //// default is 12 bit resolution, 750 ms conversion time
+  }
+  celsius = (float)raw / 16.0;
+  fahrenheit = celsius * 1.8 + 32.0;
+  Serial.print("  Temperature = ");
+  Serial.print(celsius);
+  Serial.print(" Celsius, ");
+  Serial.print(fahrenheit);
+  Serial.println(" Fahrenheit");
+}
diff --git a/libraries/OneWire/examples/DS2408_Switch/DS2408_Switch.pde b/libraries/OneWire/examples/DS2408_Switch/DS2408_Switch.pde
new file mode 100644
index 0000000..d171f9b
--- /dev/null
+++ b/libraries/OneWire/examples/DS2408_Switch/DS2408_Switch.pde
@@ -0,0 +1,77 @@
+#include <OneWire.h>
+
+/*
+ * DS2408 8-Channel Addressable Switch
+ *
+ * Writte by Glenn Trewitt, glenn at trewitt dot org
+ *
+ * Some notes about the DS2408:
+ *   - Unlike most input/output ports, the DS2408 doesn't have mode bits to
+ *       set whether the pins are input or output.  If you issue a read command,
+ *       they're inputs.  If you write to them, they're outputs.
+ *   - For reading from a switch, you should use 10K pull-up resisters.
+ */
+
+void PrintBytes(uint8_t* addr, uint8_t count, bool newline=0) {
+  for (uint8_t i = 0; i < count; i++) {
+    Serial.print(addr[i]>>4, HEX);
+    Serial.print(addr[i]&0x0f, HEX);
+  }
+  if (newline)
+    Serial.println();
+}
+
+void ReadAndReport(OneWire* net, uint8_t* addr) {
+  Serial.print("  Reading DS2408 ");
+  PrintBytes(addr, 8);
+  Serial.println();
+	
+  uint8_t buf[13];  // Put everything in the buffer so we can compute CRC easily.
+  buf[0] = 0xF0;    // Read PIO Registers
+  buf[1] = 0x88;    // LSB address
+  buf[2] = 0x00;    // MSB address
+  net->write_bytes(buf, 3);
+  net->read_bytes(buf+3, 10);     // 3 cmd bytes, 6 data bytes, 2 0xFF, 2 CRC16
+  net->reset();
+
+  if (!OneWire::check_crc16(buf, 11, &buf[11])) {
+    Serial.print("CRC failure in DS2408 at ");
+    PrintBytes(addr, 8, true);
+    return;
+  }
+  Serial.print("  DS2408 data = ");
+  // First 3 bytes contain command, register address.
+  Serial.println(buf[3], BIN);
+}
+
+OneWire net(10);  // on pin 10
+
+void setup(void) {
+  Serial.begin(9600);
+}
+
+void loop(void) {
+  byte i;
+  byte present = 0;
+  byte addr[8];
+  
+  if (!net.search(addr)) {
+    Serial.print("No more addresses.\n");
+    net.reset_search();
+    delay(1000);
+    return;
+  }
+  
+  if (OneWire::crc8(addr, 7) != addr[7]) {
+    Serial.print("CRC is not valid!\n");
+    return;
+  }
+  
+  if (addr[0] != 0x29) {
+    PrintBytes(addr, 8);
+    Serial.print(" is not a DS2408.\n");
+    return;
+  }
+
+  ReadAndReport(&net, addr);
+}
diff --git a/libraries/OneWire/examples/DS250x_PROM/DS250x_PROM.pde b/libraries/OneWire/examples/DS250x_PROM/DS250x_PROM.pde
new file mode 100644
index 0000000..a85b1c2
--- /dev/null
+++ b/libraries/OneWire/examples/DS250x_PROM/DS250x_PROM.pde
@@ -0,0 +1,90 @@
+/*
+DS250x add-only programmable memory reader w/SKIP ROM.
+ 
+ The DS250x is a 512/1024bit add-only PROM(you can add data but cannot change the old one) that's used mainly for device identification purposes
+ like serial number, mfgr data, unique identifiers, etc. It uses the Maxim 1-wire bus.
+ 
+ This sketch will use the SKIP ROM function that skips the 1-Wire search phase since we only have one device connected in the bus on digital pin 6.
+ If more than one device is connected to the bus, it will fail.
+ Sketch will not verify if device connected is from the DS250x family since the skip rom function effectively skips the family-id byte readout.
+ thus it is possible to run this sketch with any Maxim OneWire device in which case the command CRC will most likely fail.
+ Sketch will only read the first page of memory(32bits) starting from the lower address(0000h), if more than 1 device is present, then use the sketch with search functions.
+ Remember to put a 4.7K pullup resistor between pin 6 and +Vcc
+ 
+ To change the range or ammount of data to read, simply change the data array size, LSB/MSB addresses and for loop iterations
+ 
+ This example code is in the public domain and is provided AS-IS.
+ 
+ Built with Arduino 0022 and PJRC OneWire 2.0 library http://www.pjrc.com/teensy/td_libs_OneWire.html
+ 
+ created by Guillermo Lovato <glovato@gmail.com>
+ march/2011
+ 
+ */
+
+#include <OneWire.h>
+OneWire ds(6);                    // OneWire bus on digital pin 6
+void setup() {
+  Serial.begin (9600);
+}
+
+void loop() {
+  byte i;                         // This is for the for loops
+  boolean present;                // device present var
+  byte data[32];                  // container for the data from device
+  byte leemem[3] = {              // array with the commands to initiate a read, DS250x devices expect 3 bytes to start a read: command,LSB&MSB adresses
+    0xF0 , 0x00 , 0x00   };       // 0xF0 is the Read Data command, followed by 00h 00h as starting address(the beginning, 0000h)
+  byte ccrc;                      // Variable to store the command CRC
+  byte ccrc_calc;
+
+  present = ds.reset();           // OneWire bus reset, always needed to start operation on the bus, returns a 1/TRUE if there's a device present.
+  ds.skip();                      // Skip ROM search
+
+  if (present == TRUE){           // We only try to read the data if there's a device present 
+    Serial.println("DS250x device present");
+    ds.write(leemem[0],1);        // Read data command, leave ghost power on
+    ds.write(leemem[1],1);        // LSB starting address, leave ghost power on
+    ds.write(leemem[2],1);        // MSB starting address, leave ghost power on
+
+    ccrc = ds.read();             // DS250x generates a CRC for the command we sent, we assign a read slot and store it's value
+    ccrc_calc = OneWire::crc8(leemem, 3);  // We calculate the CRC of the commands we sent using the library function and store it
+
+    if ( ccrc_calc != ccrc) {      // Then we compare it to the value the ds250x calculated, if it fails, we print debug messages and abort
+      Serial.println("Invalid command CRC!");
+      Serial.print("Calculated CRC:");
+      Serial.println(ccrc_calc,HEX);    // HEX makes it easier to observe and compare
+      Serial.print("DS250x readback CRC:");
+      Serial.println(ccrc,HEX);
+      return;                      // Since CRC failed, we abort the rest of the loop and start over
+    }
+    Serial.println("Data is: ");   // For the printout of the data 
+    for ( i = 0; i < 32; i++) {    // Now it's time to read the PROM data itself, each page is 32 bytes so we need 32 read commands
+      data[i] = ds.read();         // we store each read byte to a different position in the data array 
+      Serial.print(data[i]);       // printout in ASCII
+      Serial.print(" ");           // blank space 
+    }
+    Serial.println();
+    delay(5000);                    // Delay so we don't saturate the serial output
+  }
+  else {                           // Nothing is connected in the bus 
+    Serial.println("Nothing connected");
+    delay(3000);
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/libraries/OneWire/keywords.txt b/libraries/OneWire/keywords.txt
new file mode 100644
index 0000000..bee5d90
--- /dev/null
+++ b/libraries/OneWire/keywords.txt
@@ -0,0 +1,38 @@
+#######################################
+# Syntax Coloring Map For OneWire
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+OneWire	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+reset	KEYWORD2
+write_bit	KEYWORD2
+read_bit	KEYWORD2
+write	KEYWORD2
+write_bytes	KEYWORD2
+read	KEYWORD2
+read_bytes	KEYWORD2
+select	KEYWORD2
+skip	KEYWORD2
+depower	KEYWORD2
+reset_search	KEYWORD2
+search	KEYWORD2
+crc8	KEYWORD2
+crc16	KEYWORD2
+check_crc16	KEYWORD2
+
+#######################################
+# Instances (KEYWORD2)
+#######################################
+
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/libraries/OneWire/library.json b/libraries/OneWire/library.json
new file mode 100644
index 0000000..ed23250
--- /dev/null
+++ b/libraries/OneWire/library.json
@@ -0,0 +1,58 @@
+{
+"name": "OneWire",
+"frameworks": "Arduino",
+"keywords": "onewire, 1-wire, bus, sensor, temperature, ibutton",
+"description": "Control 1-Wire protocol (DS18S20, DS18B20, DS2408 and etc)",
+"authors":
+[
+    {
+        "name": "Paul Stoffregen",
+        "email": "paul@pjrc.com",
+        "url": "http://www.pjrc.com",
+        "maintainer": true
+    },
+    {
+        "name": "Jim Studt"
+    },
+    {
+        "name": "Tom Pollard",
+        "email": "pollard@alum.mit.edu"
+    },
+    {
+        "name": "Derek Yerger"
+    },
+    {
+        "name": "Josh Larios"
+    },
+    {
+        "name": "Robin James"
+    },
+    {
+        "name": "Glenn Trewitt"
+    },
+    {
+        "name": "Jason Dangel",
+        "email": "dangel.jason AT gmail.com"
+    },
+    {
+        "name": "Guillermo Lovato"
+    },
+    {
+        "name": "Ken Butcher"
+    },
+    {
+        "name": "Mark Tillotson"
+    },
+    {
+        "name": "Bertrik Sikken"
+    },
+    {
+        "name": "Scott Roberts"
+    }
+],
+"repository":
+{
+    "type": "git",
+    "url": "https://github.com/PaulStoffregen/OneWire"
+}
+}
diff --git a/libraries/OneWire/library.properties b/libraries/OneWire/library.properties
new file mode 100644
index 0000000..0946c9a
--- /dev/null
+++ b/libraries/OneWire/library.properties
@@ -0,0 +1,10 @@
+name=OneWire
+version=2.3.2
+author=Jim Studt, Tom Pollard, Robin James, Glenn Trewitt, Jason Dangel, Guillermo Lovato, Paul Stoffregen, Scott Roberts, Bertrik Sikken, Mark Tillotson, Ken Butcher, Roger Clark, Love Nystrom
+maintainer=Paul Stoffregen
+sentence=Access 1-wire temperature sensors, memory and other chips.
+paragraph=
+category=Communication
+url=http://www.pjrc.com/teensy/td_libs_OneWire.html
+architectures=*
+
diff --git a/libraries/Expression_Parser/LICENSE b/libraries/TFT_Objects/LICENSE
similarity index 98%
rename from libraries/Expression_Parser/LICENSE
rename to libraries/TFT_Objects/LICENSE
index d960c3c..8cdb845 100644
--- a/libraries/Expression_Parser/LICENSE
+++ b/libraries/TFT_Objects/LICENSE
@@ -1,7 +1,7 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -290,8 +290,8 @@ to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    A recursive descent expression parser in C. Supports variables, named functions and boolean operations.
-    Copyright (C) 2013  jamesgregson
+    {description}
+    Copyright (C) {year}  {fullname}
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -337,3 +337,4 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
+
diff --git a/libraries/TFT_Objects/TFT_Objects.cpp b/libraries/TFT_Objects/TFT_Objects.cpp
new file mode 100644
index 0000000..3d58786
--- /dev/null
+++ b/libraries/TFT_Objects/TFT_Objects.cpp
@@ -0,0 +1,24 @@
+/**
+ * @file TFT_Objects.cpp
+ * @date 20.05.2015
+ * @author CiccioCB
+ *
+ * Copyright (c) 2016 Ciccio CB. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+ 
diff --git a/libraries/TFT_Objects/TFT_Objects.cpp.bak b/libraries/TFT_Objects/TFT_Objects.cpp.bak
new file mode 100644
index 0000000..cd27b05
--- /dev/null
+++ b/libraries/TFT_Objects/TFT_Objects.cpp.bak
@@ -0,0 +1,23 @@
+**
+ * @file TFT_Objects.cpp
+ * @date 20.05.2015
+ * @author CiccioCB
+ *
+ * Copyright (c) 2016 Ciccio CB. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
\ No newline at end of file
diff --git a/libraries/TFT_Objects/TFT_Objects.h b/libraries/TFT_Objects/TFT_Objects.h
new file mode 100644
index 0000000..db3cb38
--- /dev/null
+++ b/libraries/TFT_Objects/TFT_Objects.h
@@ -0,0 +1,452 @@
+/**
+ * @file TFT_Objects.h
+ * @date 20.05.2015
+ * @author CiccioCB
+ *
+ * Copyright (c) 2016 Ciccio CB. All rights reserved.
+ * This file is part of the TFT_Objects for ESP8266.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+unsigned int show_bmp(String filename, uint16_t xi, uint16_t yi, int backColor, Adafruit_ILI9341 *tft, uint8_t scale);
+ 
+ enum {BUTTON, LABEL, CHECKBOX, RADIO, BAR, TEXT, ICON, TOGGLE, BOX, KEY};
+ 
+ class TFT_Object 
+ {
+ public:
+ 	uint16_t x;
+	uint16_t y;
+ 	uint16_t width;
+	uint16_t height;
+	int backcolor;
+	uint16_t forecolor;
+	uint8_t kind;
+	String label;
+	uint8_t textsize = 1;
+	bool checked = false;
+	uint8_t value;
+	String icon1;
+	String icon2;
+	uint8_t scale = 1;
+ };
+ 
+class TFT_Form
+ {
+    
+	TFT_Object **_form;
+	int _length = 0;
+	int _size = 0;
+public:	
+    Adafruit_ILI9341 *tft;// = NULL;
+	uint8_t FontSizeX = 6;
+	uint8_t FontSizeY = 7;
+	
+	TFT_Form(int size)
+	{
+		_form = (TFT_Object **) malloc(sizeof(TFT_Object * *) * size);
+		for (int i=0; i<size; i++)
+			_form[i] = NULL;
+		_size = size;
+	}
+
+	~TFT_Form()
+	{
+		for (int i=0; i<_size; i++)
+			delete _form[i];
+		free(_form);
+	}
+	
+	void clear()
+	{
+		for (int i=0; i<_size; i++)
+		{
+			delete _form[i];
+			_form[i] = NULL;
+			_length = 0;
+		}
+	}
+	
+	int length()
+	{
+		return _length;
+	}
+	
+	TFT_Object * operator [](int index) //const
+	{
+		return  (_form[index]);
+	}
+	
+	
+	int add(uint8_t kind)
+	{
+		// look for first free position
+		int i;
+		for (i=0; i<_size; i++)
+		{
+			if (_form[i] == NULL)
+			{
+				_form[i] = new TFT_Object;
+				_form[i]->kind = kind;
+				_length++;
+				return i;
+			}
+		}
+		return -1; // position not found. Class full
+	}
+	
+	void setLabel(uint8_t pos, String lab)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->label = lab;
+			drawObject(pos);
+		}
+	}
+
+	String getLabel(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			return _form[pos]->label;
+		}
+		return "";
+	}
+	
+	void setValue(uint8_t pos, float val)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->value = val;
+			drawObject(pos);
+		}
+	}
+	
+	float getValue(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			return _form[pos]->value;
+		}
+		return sqrt(-1.0); // returns nan
+	}	
+	
+	void setChecked(uint8_t pos, bool chk)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->checked = chk;
+			drawObject(pos);
+		}
+	}
+	
+	bool getChecked(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			return _form[pos]->checked;
+		}
+		return false;
+	}
+	
+	bool invertChecked(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->checked = !_form[pos]->checked;
+			drawObject(pos);
+			return _form[pos]->checked;
+		}
+		return false;
+	}	
+	
+	int checkTouch(uint16_t touchX, uint16_t touchY)
+	{
+		int i;
+		TFT_Object *obj;
+		for (i=0; i<_length; i++)
+		{
+			if (_form[i] != NULL)
+			{	
+				obj = _form[i];
+				if ( (touchX >= obj->x) && (touchY >= obj->y) && (touchX <= (obj->x + obj->width)) && (touchY <= (obj->y + obj->height)) )
+					return i;
+			}
+		}
+		return -1; // not found
+	}
+	
+	void drawObject(uint8_t pos)
+	{
+	    if (_form[pos] == NULL)
+			return;
+		TFT_Object *obj = _form[pos];
+		uint16_t r, ax, ay, rr;
+		uint16_t x, y;
+		unsigned int sz;
+		switch (obj->kind)
+		{
+			case BUTTON:
+				ax = (obj->width - (obj->label.length() * obj->textsize * FontSizeX)) >> 1;  // divided by 2
+				ay = (obj->height - obj->textsize * FontSizeY) >> 1;
+				r = obj->height / 3;
+				if (obj->checked == false)
+				{
+					tft->fillRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->backcolor);
+					tft->drawRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->forecolor);	
+					tft->setTextColor(obj->forecolor);
+				}
+				else
+				{
+					tft->fillRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->forecolor);
+					tft->drawRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->backcolor);	
+					tft->setTextColor(obj->backcolor);
+				}				
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + ax, obj->y + ay);
+				tft->print(obj->label);
+				break;
+				
+			case LABEL:
+				ax = (obj->width - (obj->label.length() * obj->textsize * FontSizeX)) >> 1;  // divided by 2
+				ay = (obj->height - obj->textsize * FontSizeY) >> 1;
+				//r = obj->height / 3;
+				tft->fillRect(obj->x, obj->y, obj->width, obj->height, obj->backcolor);
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + ax, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;
+				
+			case CHECKBOX:
+				ay = (obj->width - obj->textsize * FontSizeY) >> 1;
+				r = obj->width / 4;
+				obj->height = obj->width;
+				if (obj->checked == true)
+				{
+					tft->fillRect(obj->x, obj->y, obj->width, obj->width, obj->backcolor);
+					tft->fillRect(obj->x + r, obj->y + r, obj->width - r*2, obj->width - r*2, obj->forecolor);
+					tft->drawRect(obj->x, obj->y, obj->width, obj->width, obj->forecolor);
+					tft->drawRect(obj->x+1, obj->y+1, obj->width-2, obj->width-2, obj->forecolor);
+				}
+				else
+				{
+					tft->fillRect(obj->x, obj->y, obj->width, obj->width, obj->backcolor);
+					tft->drawRect(obj->x, obj->y, obj->width, obj->width, obj->forecolor);
+					tft->drawRect(obj->x+1, obj->y+1, obj->width-2, obj->width-2, obj->forecolor);
+				}				
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + obj->width + 2, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;	
+				
+			case RADIO:
+				ax = (obj->width) >> 1;  // divided by 2
+				ay = (obj->width - obj->textsize * FontSizeY) >> 1;
+				r = obj->width / 4;
+				x = obj->x + ax;
+				y = obj->y + ay + r;
+				rr  = obj->width / 2;
+				obj->height = obj->width;
+				if (obj->checked == true)
+				{
+					tft->fillCircle(x, y, rr, obj->backcolor);
+					tft->fillCircle(x, y, rr - r, obj->forecolor);
+					tft->drawCircle(x, y, rr, obj->forecolor);
+					tft->drawCircle(x, y, rr-1, obj->forecolor);
+				}
+				else
+				{
+					tft->fillCircle(x, y, rr, obj->backcolor);
+					tft->drawCircle(x, y, rr, obj->forecolor);
+					tft->drawCircle(x, y, rr-1, obj->forecolor);
+				}				
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + obj->width + 2, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;	
+
+			case BAR:
+				ax = (obj->width - (obj->label.length() * obj->textsize * FontSizeX)) >> 1;  // divided by 2
+				ay = (obj->height - obj->textsize * FontSizeY) >> 1;
+				r = (float)obj->value/100.0 * (obj->width -2);
+				
+				
+				tft->fillRect(obj->x+1, obj->y+1, obj->width-2, obj->height-2, 0);
+				tft->drawRect(obj->x, obj->y, obj->width, obj->height, obj->forecolor);
+				tft->fillRect(obj->x+1, obj->y+1, r, obj->height-2, obj->backcolor);
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + ax, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;
+				
+ 			case ICON:
+				sz = show_bmp(obj->icon1, obj->x, obj->y, obj->backcolor, tft, obj->scale);
+				obj->width = sz >> 16;
+				obj->height = sz & 0xffff;
+				break;
+				
+			case TOGGLE:
+				if (obj->checked == true)
+					sz = show_bmp(obj->icon1, obj->x, obj->y, obj->backcolor, tft, obj->scale);
+				else
+					sz = show_bmp(obj->icon2, obj->x, obj->y, obj->backcolor, tft, obj->scale);
+				obj->width = sz >> 16;
+				obj->height = sz & 0xffff;					
+				break;
+		}
+	}
+ };
+ 
+ //////////////////////////////////////////////////////////////////////////
+typedef struct
+{
+    short   ident __attribute__((aligned(1), packed));
+    long    file_size __attribute__((aligned(1), packed));
+    long    reserved __attribute__((aligned(1), packed));
+    long    offset __attribute__((aligned(1), packed));
+    long    header_size __attribute__((aligned(1), packed));
+    long    width __attribute__((aligned(1), packed));
+    long    height __attribute__((aligned(1), packed));
+    short   planes __attribute__((aligned(1), packed));
+    short   bits_per_pixel __attribute__((aligned(1), packed));
+    long    compression __attribute__((aligned(1), packed));
+    long    image_size __attribute__((aligned(1), packed));
+    long    hor_resolution __attribute__((aligned(1), packed));
+    long    ver_resolution __attribute__((aligned(1), packed));
+    long    palette_colors __attribute__((aligned(1), packed));
+    long    important_colors __attribute__((aligned(1), packed));
+} BMP_Header;
+
+typedef struct
+{
+  unsigned char B,G,R;
+} BMP_Pixel;
+
+typedef struct
+{
+  unsigned char B,G,R,A;
+} BMP_Pixel32;
+
+unsigned int show_bmp(String filename, uint16_t xi, uint16_t yi, int backColor, Adafruit_ILI9341 *tft, uint8_t scale)
+{
+  int r;
+  int x, y, col;
+  uint8_t rt;
+  uint8_t scx, scy;
+  BMP_Pixel32  *p32;
+  BMP_Pixel *px;
+  BMP_Header header;
+  File fs_bmp;
+  char bmp_buff[320 * 4];   // the buffer will contain a full line of 320 pixels
+  
+  fs_bmp = SPIFFS.open(filename, "r");
+  if (!fs_bmp) {
+      //HaltBasic(F("bmp file not found"));
+      return 0;
+  }
+  r = fs_bmp.readBytes((char*) &header, sizeof(header));
+  delay(0);
+  if (sizeof(header) < header.offset) // align the buffer if the header is greather that 40bytes
+      r = fs_bmp.readBytes((char*) bmp_buff, header.offset - sizeof(header));
+//   Serial.println(header.file_size);
+//   Serial.println(header.width);
+//   Serial.println(header.height);
+//   Serial.println(header.bits_per_pixel);
+  delay(0);
+ 
+  rt = tft->getRotation();
+  tft->setRotation(rt ^ 0b10);  //reverse top/bottom
+  if (rt & 1)
+  {
+      // landscape
+      xi = 320 - xi - header.width*scale;
+      yi = 240 - yi - header.height*scale;
+  }
+  else
+  {
+      // portrait
+      xi = 240 - xi - header.width*scale;
+      yi = 320 - yi - header.height*scale;
+  }
+    
+  tft->setAddrWindow(xi, yi, xi + header.width*scale - 1, yi + header.height*scale - 1);
+
+
+  if (header.bits_per_pixel == 32)
+  {
+    for (y=0; y<header.height; y++)
+    {
+        delay(0);
+        r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel32));
+		for (scy = 0; scy < scale; scy++)
+		{	  
+			digitalWrite(TFT_CS_pin, LOW);   // TFT CS low
+			for (x=0; x<header.width; x++)
+			{
+				p32 = (BMP_Pixel32 *) &bmp_buff[x * sizeof(BMP_Pixel32)];
+				col = ((p32->R & 0xf8) << 8) |  (( p32->G & 0xfc) << 3) | ((p32->B & 0xf8) >> 3) ;
+				for (scx=0; scx < scale; scx++)
+				{
+					if (p32->A > 40) // means not transparent
+					{
+						if (backColor != -1)
+						  SPI.write16(col, true);
+						else
+						  tft->drawPixel(x * scale + scx + xi , y*scale + scy + yi, col);
+					}
+					else
+					{
+					  if (backColor != -1)
+						SPI.write16(backColor, true);  // gets a background color pixel
+					  //else
+						   //tft->drawPixel(x + xi, y + yi, 0); // background
+					}
+				}
+			}
+		digitalWrite(TFT_CS_pin, HIGH);   // TFT CS High
+		}
+    }
+  }
+  else
+  {
+      for (y=0; y<header.height; y++)
+      {
+        delay(0);
+        r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel));
+		for (scy = 0; scy < scale; scy++)
+		{
+		  digitalWrite(TFT_CS_pin, LOW);   // TFT CS low
+		  for (x=0; x<header.width; x++)
+		  {
+				px = (BMP_Pixel *) &bmp_buff[x * sizeof(BMP_Pixel)];
+				col = ((px->R & 0xf8) << 8) |  (( px->G & 0xfc) << 3) | ((px->B & 0xf8) >> 3) ;
+				//tft->drawPixel(x + xi, y + yi, col);
+				for (scx=0; scx < scale; scx++)
+					SPI.write16(col, true);
+		  }
+		  digitalWrite(TFT_CS_pin, HIGH);   // TFT CS High
+		}
+      }
+  } 
+  tft->setRotation(rt); 
+  fs_bmp.close(); 
+  return (header.height*scale) << 16 | (header.width*scale);
+}
diff --git a/libraries/TFT_Objects/TFT_Objects.h.bak b/libraries/TFT_Objects/TFT_Objects.h.bak
new file mode 100644
index 0000000..213b958
--- /dev/null
+++ b/libraries/TFT_Objects/TFT_Objects.h.bak
@@ -0,0 +1,450 @@
+/**
+ * @file TFT_Objects.h
+ * @date 20.05.2015
+ * @author CiccioCB
+ *
+ * Copyright (c) 2016 Ciccio CB. All rights reserved.
+ * This file is part of the TFT_Objects for ESP8266.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+unsigned int show_bmp(String filename, uint16_t xi, uint16_t yi, int backColor, Adafruit_ILI9341 *tft, uint8_t scale);
+ 
+ enum {BUTTON, LABEL, CHECKBOX, RADIO, BAR, TEXT, ICON, TOGGLE, BOX, KEY};
+ 
+ class TFT_Object 
+ {
+ public:
+ 	uint16_t x;
+	uint16_t y;
+ 	uint16_t width;
+	uint16_t height;
+	int backcolor;
+	uint16_t forecolor;
+	uint8_t kind;
+	String label;
+	uint8_t textsize = 1;
+	bool checked = false;
+	float value;
+	String icon1;
+	String icon2;
+	uint8_t scale = 1;
+ };
+ 
+class TFT_Form
+ {
+    
+	TFT_Object **_form;
+	int _length = 0;
+	int _size = 0;
+public:	
+    Adafruit_ILI9341 *tft;// = NULL;
+	uint8_t FontSizeX = 6;
+	uint8_t FontSizeY = 7;
+	
+	TFT_Form(int size)
+	{
+		_form = (TFT_Object **) malloc(sizeof(TFT_Object * *) * size);
+		for (int i=0; i<size; i++)
+			_form[i] = NULL;
+		_size = size;
+	}
+
+	~TFT_Form()
+	{
+		for (int i=0; i<_size; i++)
+			delete _form[i];
+		free(_form);
+	}
+	
+	void clear()
+	{
+		for (int i=0; i<_size; i++)
+		{
+			delete _form[i];
+			_form[i] = NULL;
+			_length = 0;
+		}
+	}
+	
+	int length()
+	{
+		return _length;
+	}
+	
+	TFT_Object * operator [](int index) //const
+	{
+		return  (_form[index]);
+	}
+	
+	
+	int add(uint8_t kind)
+	{
+		// look for first free position
+		int i;
+		for (i=0; i<_size; i++)
+		{
+			if (_form[i] == NULL)
+			{
+				_form[i] = new TFT_Object;
+				_form[i]->kind = kind;
+				_length++;
+				return i;
+			}
+		}
+		return -1; // position not found. Class full
+	}
+	
+	void setLabel(uint8_t pos, String lab)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->label = lab;
+			drawObject(pos);
+		}
+	}
+
+	String getLabel(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			return _form[pos]->label;
+		}
+		return "";
+	}
+	
+	void setValue(uint8_t pos, float val)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->value = val;
+			drawObject(pos);
+		}
+	}
+	
+	float getValue(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			return _form[pos]->value;
+		}
+		return sqrt(-1.0); // returns nan
+	}	
+	
+	void setChecked(uint8_t pos, bool chk)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->checked = chk;
+			drawObject(pos);
+		}
+	}
+	
+	bool getChecked(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			return _form[pos]->checked;
+		}
+		return false;
+	}
+	
+	bool invertChecked(uint8_t pos)
+	{
+		if (_form[pos] != NULL)
+		{
+			_form[pos]->checked = !_form[pos]->checked;
+			drawObject(pos);
+			return _form[pos]->checked;
+		}
+		return false;
+	}	
+	
+	int checkTouch(uint16_t touchX, uint16_t touchY)
+	{
+		int i;
+		TFT_Object *obj;
+		for (i=0; i<_length; i++)
+		{
+			if (_form[i] != NULL)
+			{	
+				obj = _form[i];
+				if ( (touchX >= obj->x) && (touchY >= obj->y) && (touchX <= (obj->x + obj->width)) && (touchY <= (obj->y + obj->height)) )
+					return i;
+			}
+		}
+		return -1; // not found
+	}
+	
+	void drawObject(uint8_t pos)
+	{
+	    if (_form[pos] == NULL)
+			return;
+		TFT_Object *obj = _form[pos];
+		uint16_t r, ax, ay, rr;
+		uint16_t x, y;
+		unsigned int sz;
+		switch (obj->kind)
+		{
+			case BUTTON:
+				ax = (obj->width - (obj->label.length() * obj->textsize * FontSizeX)) >> 1;  // divided by 2
+				ay = (obj->height - obj->textsize * FontSizeY) >> 1;
+				r = obj->height / 3;
+				if (obj->checked == false)
+				{
+					tft->fillRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->backcolor);
+					tft->drawRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->forecolor);	
+					tft->setTextColor(obj->forecolor);
+				}
+				else
+				{
+					tft->fillRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->forecolor);
+					tft->drawRoundRect(obj->x, obj->y, obj->width, obj->height, r, obj->backcolor);	
+					tft->setTextColor(obj->backcolor);
+				}				
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + ax, obj->y + ay);
+				tft->print(obj->label);
+				break;
+				
+			case LABEL:
+				ax = (obj->width - (obj->label.length() * obj->textsize * FontSizeX)) >> 1;  // divided by 2
+				ay = (obj->height - obj->textsize * FontSizeY) >> 1;
+				//r = obj->height / 3;
+				tft->fillRect(obj->x, obj->y, obj->width, obj->height, obj->backcolor);
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + ax, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;
+				
+			case CHECKBOX:
+				ay = (obj->width - obj->textsize * FontSizeY) >> 1;
+				r = obj->width / 4;
+				obj->height = obj->width;
+				if (obj->checked == true)
+				{
+					tft->fillRect(obj->x, obj->y, obj->width, obj->width, obj->backcolor);
+					tft->fillRect(obj->x + r, obj->y + r, obj->width - r*2, obj->width - r*2, obj->forecolor);
+					tft->drawRect(obj->x, obj->y, obj->width, obj->width, obj->forecolor);
+					tft->drawRect(obj->x+1, obj->y+1, obj->width-2, obj->width-2, obj->forecolor);
+				}
+				else
+				{
+					tft->fillRect(obj->x, obj->y, obj->width, obj->width, obj->backcolor);
+					tft->drawRect(obj->x, obj->y, obj->width, obj->width, obj->forecolor);
+					tft->drawRect(obj->x+1, obj->y+1, obj->width-2, obj->width-2, obj->forecolor);
+				}				
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + obj->width + 2, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;	
+				
+			case RADIO:
+				ax = (obj->width) >> 1;  // divided by 2
+				ay = (obj->width - obj->textsize * FontSizeY) >> 1;
+				r = obj->width / 4;
+				x = obj->x + ax;
+				y = obj->y + ay + r;
+				rr  = obj->width / 2;
+				obj->height = obj->width;
+				if (obj->checked == true)
+				{
+					tft->fillCircle(x, y, rr, obj->backcolor);
+					tft->fillCircle(x, y, rr - r, obj->forecolor);
+					tft->drawCircle(x, y, rr, obj->forecolor);
+					tft->drawCircle(x, y, rr-1, obj->forecolor);
+				}
+				else
+				{
+					tft->fillCircle(x, y, rr, obj->backcolor);
+					tft->drawCircle(x, y, rr, obj->forecolor);
+					tft->drawCircle(x, y, rr-1, obj->forecolor);
+				}				
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + obj->width + 2, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;	
+
+			case BAR:
+				ax = (obj->width - (obj->label.length() * obj->textsize * FontSizeX)) >> 1;  // divided by 2
+				ay = (obj->height - obj->textsize * FontSizeY) >> 1;
+				r = obj->value/100 * (obj->width -2);
+				tft->fillRect(obj->x+1, obj->y+1, obj->width-2, obj->height-2, 0);
+				tft->drawRect(obj->x, obj->y, obj->width, obj->height, obj->forecolor);
+				tft->fillRect(obj->x+1, obj->y+1, r, obj->height-2, obj->backcolor);
+				tft->setTextSize(obj->textsize);
+				tft->setCursor(obj->x + ax, obj->y + ay);
+				tft->setTextColor(obj->forecolor);
+				tft->print(obj->label);
+				break;
+				
+ 			case ICON:
+				sz = show_bmp(obj->icon1, obj->x, obj->y, obj->backcolor, tft, obj->scale);
+				obj->width = sz >> 16;
+				obj->height = sz & 0xffff;
+				break;
+				
+			case TOGGLE:
+				if (obj->checked == true)
+					sz = show_bmp(obj->icon1, obj->x, obj->y, obj->backcolor, tft, obj->scale);
+				else
+					sz = show_bmp(obj->icon2, obj->x, obj->y, obj->backcolor, tft, obj->scale);
+				obj->width = sz >> 16;
+				obj->height = sz & 0xffff;					
+				break;
+		}
+	}
+ };
+ 
+ //////////////////////////////////////////////////////////////////////////
+typedef struct
+{
+    short   ident __attribute__((aligned(1), packed));
+    long    file_size __attribute__((aligned(1), packed));
+    long    reserved __attribute__((aligned(1), packed));
+    long    offset __attribute__((aligned(1), packed));
+    long    header_size __attribute__((aligned(1), packed));
+    long    width __attribute__((aligned(1), packed));
+    long    height __attribute__((aligned(1), packed));
+    short   planes __attribute__((aligned(1), packed));
+    short   bits_per_pixel __attribute__((aligned(1), packed));
+    long    compression __attribute__((aligned(1), packed));
+    long    image_size __attribute__((aligned(1), packed));
+    long    hor_resolution __attribute__((aligned(1), packed));
+    long    ver_resolution __attribute__((aligned(1), packed));
+    long    palette_colors __attribute__((aligned(1), packed));
+    long    important_colors __attribute__((aligned(1), packed));
+} BMP_Header;
+
+typedef struct
+{
+  unsigned char B,G,R;
+} BMP_Pixel;
+
+typedef struct
+{
+  unsigned char B,G,R,A;
+} BMP_Pixel32;
+
+unsigned int show_bmp(String filename, uint16_t xi, uint16_t yi, int backColor, Adafruit_ILI9341 *tft, uint8_t scale)
+{
+  int r;
+  int x, y, col;
+  uint8_t rt;
+  uint8_t scx, scy;
+  BMP_Pixel32  *p32;
+  BMP_Pixel *px;
+  BMP_Header header;
+  File fs_bmp;
+  char bmp_buff[320 * 4];   // the buffer will contain a full line of 320 pixels
+  
+  fs_bmp = SPIFFS.open(filename, "r");
+  if (!fs_bmp) {
+      //HaltBasic(F("bmp file not found"));
+      return 0;
+  }
+  r = fs_bmp.readBytes((char*) &header, sizeof(header));
+  delay(0);
+  if (sizeof(header) < header.offset) // align the buffer if the header is greather that 40bytes
+      r = fs_bmp.readBytes((char*) bmp_buff, header.offset - sizeof(header));
+//   Serial.println(header.file_size);
+//   Serial.println(header.width);
+//   Serial.println(header.height);
+//   Serial.println(header.bits_per_pixel);
+  delay(0);
+ 
+  rt = tft->getRotation();
+  tft->setRotation(rt ^ 0b10);  //reverse top/bottom
+  if (rt & 1)
+  {
+      // landscape
+      xi = 320 - xi - header.width*scale;
+      yi = 240 - yi - header.height*scale;
+  }
+  else
+  {
+      // portrait
+      xi = 240 - xi - header.width*scale;
+      yi = 320 - yi - header.height*scale;
+  }
+    
+  tft->setAddrWindow(xi, yi, xi + header.width*scale - 1, yi + header.height*scale - 1);
+
+
+  if (header.bits_per_pixel == 32)
+  {
+    for (y=0; y<header.height; y++)
+    {
+        delay(0);
+        r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel32));
+		for (scy = 0; scy < scale; scy++)
+		{	  
+			digitalWrite(TFT_CS_pin, LOW);   // TFT CS low
+			for (x=0; x<header.width; x++)
+			{
+				p32 = (BMP_Pixel32 *) &bmp_buff[x * sizeof(BMP_Pixel32)];
+				col = ((p32->R & 0xf8) << 8) |  (( p32->G & 0xfc) << 3) | ((p32->B & 0xf8) >> 3) ;
+				for (scx=0; scx < scale; scx++)
+				{
+					if (p32->A > 40) // means not transparent
+					{
+						if (backColor != -1)
+						  SPI.write16(col, true);
+						else
+						  tft->drawPixel(x * scale + scx + xi , y*scale + scy + yi, col);
+					}
+					else
+					{
+					  if (backColor != -1)
+						SPI.write16(backColor, true);  // gets a background color pixel
+					  //else
+						   //tft->drawPixel(x + xi, y + yi, 0); // background
+					}
+				}
+			}
+		digitalWrite(TFT_CS_pin, HIGH);   // TFT CS High
+		}
+    }
+  }
+  else
+  {
+      for (y=0; y<header.height; y++)
+      {
+        delay(0);
+        r = fs_bmp.readBytes((char*) bmp_buff, header.width * sizeof(BMP_Pixel));
+		for (scy = 0; scy < scale; scy++)
+		{
+		  digitalWrite(TFT_CS_pin, LOW);   // TFT CS low
+		  for (x=0; x<header.width; x++)
+		  {
+				px = (BMP_Pixel *) &bmp_buff[x * sizeof(BMP_Pixel)];
+				col = ((px->R & 0xf8) << 8) |  (( px->G & 0xfc) << 3) | ((px->B & 0xf8) >> 3) ;
+				//tft->drawPixel(x + xi, y + yi, col);
+				for (scx=0; scx < scale; scx++)
+					SPI.write16(col, true);
+		  }
+		  digitalWrite(TFT_CS_pin, HIGH);   // TFT CS High
+		}
+      }
+  } 
+  tft->setRotation(rt); 
+  fs_bmp.close(); 
+  return (header.height*scale) << 16 | (header.width*scale);
+}
diff --git a/libraries/WebSockets/LICENSE b/libraries/WebSockets/LICENSE
new file mode 100644
index 0000000..f166cc5
--- /dev/null
+++ b/libraries/WebSockets/LICENSE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
\ No newline at end of file
diff --git a/libraries/WebSockets/README.md b/libraries/WebSockets/README.md
new file mode 100644
index 0000000..f9fd994
--- /dev/null
+++ b/libraries/WebSockets/README.md
@@ -0,0 +1,64 @@
+WebSocket Server and Client for Arduino
+===========================================
+
+a WebSocket Server and Client for Arduino based on RFC6455.
+
+ 
+##### Supported features of RFC6455 #####
+ - text frame
+ - binary frame
+ - connection close
+ - ping
+ - pong
+ 
+##### Not supported features of RFC6455 #####
+ - continuation frame
+  
+##### Limitations #####
+ - max input length is limited to the ram size and the ```WEBSOCKETS_MAX_DATA_SIZE``` define
+ - max output length has no limit (the hardware is the limit)
+ - Client send big frames with mask 0x00000000 (on AVR all frames)
+ 
+ ##### Limitations for Async #####
+ - Functions called from within the context of the websocket event might not honor `yield()` and/or `delay()`.  See [this issue](https://github.com/Links2004/arduinoWebSockets/issues/58#issuecomment-192376395) for more info and a potential workaround.
+ - wss / SSL is not possible.
+ 
+##### Supported Hardware #####
+ - ESP8266 [Arduino for ESP8266](https://github.com/Links2004/Arduino)
+ - ESP31B
+ - ATmega328 with Ethernet Shield (ATmega branch) 
+ - ATmega328 with enc28j60 (ATmega branch) 
+ - ATmega2560 with Ethernet Shield (ATmega branch) 
+ - ATmega2560 with enc28j60 (ATmega branch) 
+ 
+###### Note: ######
+
+  version 2.0 and up is not compatible with AVR/ATmega, check ATmega branch.
+  
+  Arduino for AVR not supports std namespace of c++.
+ 
+### wss / SSL ###
+ supported for:
+ - wss client on the ESP8266
+ - wss / SSL is not natively supported in WebSocketsServer however it is possible to achieve secure websockets
+   by running the device behind an SSL proxy. See [Nginx](examples/Nginx/esp8266.ssl.reverse.proxy.conf) for a
+   sample Nginx server configuration file to enable this. 
+ 
+### ESP Async TCP ###
+
+This libary can run in Async TCP mode on the ESP.
+
+The mode can be aktivated in the ```WebSockets.h``` (see WEBSOCKETS_NETWORK_TYPE define).
+
+[ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP) libary is required.
+
+### Issues ###
+Submit issues to: https://github.com/Links2004/arduinoWebSockets/issues
+
+[![Join the chat at https://gitter.im/Links2004/arduinoWebSockets](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Links2004/arduinoWebSockets?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+### License and credits ###
+
+The library is licensed under [LGPLv2.1](https://github.com/Links2004/arduinoWebSockets/blob/master/LICENSE)
+
+[libb64](http://libb64.sourceforge.net/) written by Chris Venter. It is distributed under Public Domain see [LICENSE](https://github.com/Links2004/arduinoWebSockets/blob/master/src/libb64/LICENSE).
diff --git a/libraries/WebSockets/examples/Nginx/esp8266.ssl.reverse.proxy.conf b/libraries/WebSockets/examples/Nginx/esp8266.ssl.reverse.proxy.conf
new file mode 100644
index 0000000..ec5aa89
--- /dev/null
+++ b/libraries/WebSockets/examples/Nginx/esp8266.ssl.reverse.proxy.conf
@@ -0,0 +1,83 @@
+# ESP8266 nginx SSL reverse proxy configuration file (tested and working on nginx v1.10.0)
+
+# proxy cache location
+proxy_cache_path /opt/etc/nginx/cache levels=1:2 keys_zone=ESP8266_cache:10m max_size=10g inactive=5m use_temp_path=off;
+
+# webserver proxy
+server {
+
+    # general server parameters
+    listen                      50080;
+    server_name                 myDomain.net;
+    access_log                  /opt/var/log/nginx/myDomain.net.access.log;       
+
+    # SSL configuration
+    ssl                         on;
+    ssl_certificate             /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/fullchain.pem;
+    ssl_certificate_key         /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/privkey.pem;
+    ssl_session_cache           builtin:1000  shared:SSL:10m;
+    ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers                 HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
+    ssl_prefer_server_ciphers   on;
+    
+    location / {
+
+      # proxy caching configuration
+      proxy_cache             ESP8266_cache;
+      proxy_cache_revalidate  on;
+      proxy_cache_min_uses    1;
+      proxy_cache_use_stale   off;
+      proxy_cache_lock        on;
+      # proxy_cache_bypass      $http_cache_control;      
+      # include the sessionId cookie value as part of the cache key - keeps the cache per user
+      # proxy_cache_key         $proxy_host$request_uri$cookie_sessionId;
+
+      # header pass through configuration
+      proxy_set_header        Host $host;      
+      proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header        X-Forwarded-Proto $scheme;      
+
+      # ESP8266 custom headers which identify to the device that it's running through an SSL proxy     
+      proxy_set_header        X-SSL On;
+      proxy_set_header        X-SSL-WebserverPort 50080;
+      proxy_set_header        X-SSL-WebsocketPort 50081;
+
+      # extra debug headers      
+      add_header              X-Proxy-Cache $upstream_cache_status;
+      add_header              X-Forwarded-For $proxy_add_x_forwarded_for;
+
+      # actual proxying configuration
+      proxy_ssl_session_reuse on;
+      # target the IP address of the device with proxy_pass
+      proxy_pass              http://192.168.0.20;
+      proxy_read_timeout      90;
+    }
+ }
+
+# websocket proxy
+server {
+
+    # general server parameters
+    listen                      50081;
+    server_name                 myDomain.net;
+    access_log                  /opt/var/log/nginx/myDomain.net.wss.access.log;
+
+    # SSL configuration
+    ssl                         on;
+    ssl_certificate             /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/fullchain.pem;
+    ssl_certificate_key         /usr/builtin/etc/certificate/lets-encrypt/myDomain.net/privkey.pem;
+    ssl_session_cache           builtin:1000  shared:SSL:10m;
+    ssl_protocols               TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers                 HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
+    ssl_prefer_server_ciphers   on;
+    
+    location / {     
+
+      # websocket upgrade tunnel configuration
+      proxy_pass                    http://192.168.0.20:81;
+      proxy_http_version            1.1;
+      proxy_set_header Upgrade      $http_upgrade;
+      proxy_set_header Connection   "Upgrade";
+      proxy_read_timeout            86400;
+    }
+ }
diff --git a/libraries/WebSockets/examples/WebSocketClient/WebSocketClient.ino b/libraries/WebSockets/examples/WebSocketClient/WebSocketClient.ino
new file mode 100644
index 0000000..7a64302
--- /dev/null
+++ b/libraries/WebSockets/examples/WebSocketClient/WebSocketClient.ino
@@ -0,0 +1,87 @@
+/*
+ * WebSocketClient.ino
+ *
+ *  Created on: 24.05.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+#include <WebSocketsClient.h>
+
+#include <Hash.h>
+
+ESP8266WiFiMulti WiFiMulti;
+WebSocketsClient webSocket;
+
+
+#define USE_SERIAL Serial1
+
+void webSocketEvent(WStype_t type, uint8_t * payload, size_t lenght) {
+
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[WSc] Disconnected!\n");
+            break;
+        case WStype_CONNECTED:
+            {
+                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
+				
+			    // send message to server when Connected
+				webSocket.sendTXT("Connected");
+            }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
+
+			// send message to server
+			// webSocket.sendTXT("message here");
+            break;
+        case WStype_BIN:
+            USE_SERIAL.printf("[WSc] get binary lenght: %u\n", lenght);
+            hexdump(payload, lenght);
+
+            // send data to server
+            // webSocket.sendBIN(payload, lenght);
+            break;
+    }
+
+}
+
+void setup() {
+    // USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //Serial.setDebugOutput(true);
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+      for(uint8_t t = 4; t > 0; t--) {
+          USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+          USE_SERIAL.flush();
+          delay(1000);
+      }
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    //WiFi.disconnect();
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    webSocket.begin("192.168.0.123", 81);
+    //webSocket.setAuthorization("user", "Password"); // HTTP Basic Authorization
+    webSocket.onEvent(webSocketEvent);
+
+}
+
+void loop() {
+    webSocket.loop();
+}
diff --git a/libraries/WebSockets/examples/WebSocketClientAVR/WebSocketClientAVR.ino b/libraries/WebSockets/examples/WebSocketClientAVR/WebSocketClientAVR.ino
new file mode 100644
index 0000000..9d49d14
--- /dev/null
+++ b/libraries/WebSockets/examples/WebSocketClientAVR/WebSocketClientAVR.ino
@@ -0,0 +1,84 @@
+/*
+ * WebSocketClientAVR.ino
+ *
+ *  Created on: 10.12.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <SPI.h>
+#include <Ethernet.h>
+
+#include <WebSocketsClient.h>
+
+
+
+// Enter a MAC address for your controller below.
+// Newer Ethernet shields have a MAC address printed on a sticker on the shield
+byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+
+// Set the static IP address to use if the DHCP fails to assign
+IPAddress ip(192, 168, 0, 177);
+
+WebSocketsClient webSocket;
+
+
+
+void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
+
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            Serial.println("[WSc] Disconnected!\n");
+            break;
+        case WStype_CONNECTED:
+            {
+                Serial.print("[WSc] Connected to url: ");
+                Serial.println((char *)payload);
+                // send message to server when Connected
+                webSocket.sendTXT("Connected");
+            }
+            break;
+        case WStype_TEXT:
+            Serial.print("[WSc] get text: ");
+            Serial.println((char *)payload);
+            // send message to server
+            // webSocket.sendTXT("message here");
+            break;
+        case WStype_BIN:
+            Serial.print("[WSc] get binary length: ");
+            Serial.println(length);
+           // hexdump(payload, length);
+
+            // send data to server
+            // webSocket.sendBIN(payload, length);
+            break;
+    }
+
+}
+
+void setup()
+{
+    // Open serial communications and wait for port to open:
+    Serial.begin(115200);
+    while (!Serial) {}
+
+    // start the Ethernet connection:
+    if (Ethernet.begin(mac) == 0) {
+      Serial.println("Failed to configure Ethernet using DHCP");
+      // no point in carrying on, so do nothing forevermore:
+      // try to congifure using IP address instead of DHCP:
+      Ethernet.begin(mac, ip);
+    }
+
+    webSocket.begin("192.168.0.123", 8011);
+    webSocket.onEvent(webSocketEvent);
+
+}
+
+
+void loop()
+{
+    webSocket.loop();
+}
diff --git a/libraries/WebSockets/examples/WebSocketClientSSL/WebSocketClientSSL.ino b/libraries/WebSockets/examples/WebSocketClientSSL/WebSocketClientSSL.ino
new file mode 100644
index 0000000..d45060e
--- /dev/null
+++ b/libraries/WebSockets/examples/WebSocketClientSSL/WebSocketClientSSL.ino
@@ -0,0 +1,88 @@
+/*
+ * WebSocketClientSSL.ino
+ *
+ *  Created on: 10.12.2015
+ *
+ *  note SSL is only possible with the ESP8266
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+#include <WebSocketsClient.h>
+
+#include <Hash.h>
+
+ESP8266WiFiMulti WiFiMulti;
+WebSocketsClient webSocket;
+
+
+#define USE_SERIAL Serial1
+
+void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
+
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[WSc] Disconnected!\n");
+            break;
+        case WStype_CONNECTED:
+            {
+                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
+				
+			    // send message to server when Connected
+				webSocket.sendTXT("Connected");
+            }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
+
+			// send message to server
+			// webSocket.sendTXT("message here");
+            break;
+        case WStype_BIN:
+            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
+            hexdump(payload, length);
+
+            // send data to server
+            // webSocket.sendBIN(payload, length);
+            break;
+    }
+
+}
+
+void setup() {
+    // USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //Serial.setDebugOutput(true);
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+      for(uint8_t t = 4; t > 0; t--) {
+          USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+          USE_SERIAL.flush();
+          delay(1000);
+      }
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    //WiFi.disconnect();
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    webSocket.beginSSL("192.168.0.123", 81);
+    webSocket.onEvent(webSocketEvent);
+
+}
+
+void loop() {
+    webSocket.loop();
+}
diff --git a/libraries/WebSockets/examples/WebSocketServer/WebSocketServer.ino b/libraries/WebSockets/examples/WebSocketServer/WebSocketServer.ino
new file mode 100644
index 0000000..1efcfdf
--- /dev/null
+++ b/libraries/WebSockets/examples/WebSocketServer/WebSocketServer.ino
@@ -0,0 +1,86 @@
+/*
+ * WebSocketServer.ino
+ *
+ *  Created on: 22.05.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+#include <WebSocketsServer.h>
+#include <Hash.h>
+
+ESP8266WiFiMulti WiFiMulti;
+
+WebSocketsServer webSocket = WebSocketsServer(81);
+
+#define USE_SERIAL Serial1
+
+void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght) {
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[%u] Disconnected!\n", num);
+            break;
+        case WStype_CONNECTED:
+            {
+                IPAddress ip = webSocket.remoteIP(num);
+                USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+				
+				// send message to client
+				webSocket.sendTXT(num, "Connected");
+            }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
+
+            // send message to client
+            // webSocket.sendTXT(num, "message here");
+
+            // send data to all connected clients
+            // webSocket.broadcastTXT("message here");
+            break;
+        case WStype_BIN:
+            USE_SERIAL.printf("[%u] get binary lenght: %u\n", num, lenght);
+            hexdump(payload, lenght);
+
+            // send message to client
+            // webSocket.sendBIN(num, payload, lenght);
+            break;
+    }
+
+}
+
+void setup() {
+    // USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //Serial.setDebugOutput(true);
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    webSocket.begin();
+    webSocket.onEvent(webSocketEvent);
+}
+
+void loop() {
+    webSocket.loop();
+}
+
diff --git a/libraries/WebSockets/examples/WebSocketServer/WebSocketServerHttpHeaderValidation.ino b/libraries/WebSockets/examples/WebSocketServer/WebSocketServerHttpHeaderValidation.ino
new file mode 100644
index 0000000..8bc646c
--- /dev/null
+++ b/libraries/WebSockets/examples/WebSocketServer/WebSocketServerHttpHeaderValidation.ino
@@ -0,0 +1,86 @@
+/*
+ * WebSocketServerHttpHeaderValidation.ino
+ *
+ *  Created on: 08.06.2016
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+#include <WebSocketsServer.h>
+#include <Hash.h>
+
+ESP8266WiFiMulti WiFiMulti;
+
+WebSocketsServer webSocket = WebSocketsServer(81);
+
+#define USE_SERIAL Serial1
+
+const unsigned long int validSessionId = 12345; //some arbitrary value to act as a valid sessionId
+
+/*
+ * Returns a bool value as an indicator to describe whether a user is allowed to initiate a websocket upgrade
+ * based on the value of a cookie. This function expects the rawCookieHeaderValue to look like this "sessionId=<someSessionIdNumberValue>|"
+ */
+bool isCookieValid(String rawCookieHeaderValue) {
+
+	if (rawCookieHeaderValue.indexOf("sessionId") != -1) {
+		String sessionIdStr = rawCookieHeaderValue.substring(rawCookieHeaderValue.indexOf("sessionId=") + 10, rawCookieHeaderValue.indexOf("|"));
+		unsigned long int sessionId = strtoul(sessionIdStr.c_str(), NULL, 10);
+		return sessionId == validSessionId;
+	}
+	return false;
+}
+
+/*
+ * The WebSocketServerHttpHeaderValFunc delegate passed to webSocket.onValidateHttpHeader
+ */
+bool validateHttpHeader(String headerName, String headerValue) {
+
+	//assume a true response for any headers not handled by this validator
+	bool valid = true;
+
+	if(headerName.equalsIgnoreCase("Cookie")) {
+		//if the header passed is the Cookie header, validate it according to the rules in 'isCookieValid' function
+		valid = isCookieValid(headerValue);
+	}
+
+	return valid;
+}
+
+void setup() {
+    // USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //Serial.setDebugOutput(true);
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    //connecting clients must supply a valid session cookie at websocket upgrade handshake negotiation time
+    const char * headerkeys[] = { "Cookie" };
+    size_t headerKeyCount = sizeof(headerkeys) / sizeof(char*);
+    webSocket.onValidateHttpHeader(validateHttpHeader, headerkeys, headerKeyCount);
+    webSocket.begin();
+}
+
+void loop() {
+    webSocket.loop();
+}
+
diff --git a/libraries/WebSockets/examples/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino b/libraries/WebSockets/examples/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino
new file mode 100644
index 0000000..b71b7cd
--- /dev/null
+++ b/libraries/WebSockets/examples/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino
@@ -0,0 +1,122 @@
+/*
+ * WebSocketServer_LEDcontrol.ino
+ *
+ *  Created on: 26.11.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+#include <WebSocketsServer.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+#include <Hash.h>
+
+#define LED_RED     15
+#define LED_GREEN   12
+#define LED_BLUE    13
+
+#define USE_SERIAL Serial
+
+
+ESP8266WiFiMulti WiFiMulti;
+
+ESP8266WebServer server = ESP8266WebServer(80);
+WebSocketsServer webSocket = WebSocketsServer(81);
+
+void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght) {
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[%u] Disconnected!\n", num);
+            break;
+        case WStype_CONNECTED: {
+            IPAddress ip = webSocket.remoteIP(num);
+            USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+
+            // send message to client
+            webSocket.sendTXT(num, "Connected");
+        }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
+
+            if(payload[0] == '#') {
+                // we get RGB data
+
+                // decode rgb data
+                uint32_t rgb = (uint32_t) strtol((const char *) &payload[1], NULL, 16);
+
+                analogWrite(LED_RED,    ((rgb >> 16) & 0xFF));
+                analogWrite(LED_GREEN,  ((rgb >> 8) & 0xFF));
+                analogWrite(LED_BLUE,   ((rgb >> 0) & 0xFF));
+            }
+
+            break;
+    }
+
+}
+
+void setup() {
+    //USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    pinMode(LED_RED, OUTPUT);
+    pinMode(LED_GREEN, OUTPUT);
+    pinMode(LED_BLUE, OUTPUT);
+
+    digitalWrite(LED_RED, 1);
+    digitalWrite(LED_GREEN, 1);
+    digitalWrite(LED_BLUE, 1);
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    // start webSocket server
+    webSocket.begin();
+    webSocket.onEvent(webSocketEvent);
+
+    if(MDNS.begin("esp8266")) {
+        USE_SERIAL.println("MDNS responder started");
+    }
+
+    // handle index
+    server.on("/", []() {
+        // send index.html
+        server.send(200, "text/html", "<html><head><script>var connection = new WebSocket('ws://'+location.hostname+':81/', ['arduino']);connection.onopen = function () {  connection.send('Connect ' + new Date()); }; connection.onerror = function (error) {    console.log('WebSocket Error ', error);};connection.onmessage = function (e) {  console.log('Server: ', e.data);};function sendRGB() {  var r = parseInt(document.getElementById('r').value).toString(16);  var g = parseInt(document.getElementById('g').value).toString(16);  var b = parseInt(document.getElementById('b').value).toString(16);  if(r.length < 2) { r = '0' + r; }   if(g.length < 2) { g = '0' + g; }   if(b.length < 2) { b = '0' + b; }   var rgb = '#'+r+g+b;    console.log('RGB: ' + rgb); connection.send(rgb); }</script></head><body>LED Control:<br/><br/>R: <input id=\"r\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/>G: <input id=\"g\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/>B: <input id=\"b\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/></body></html>");
+    });
+
+    server.begin();
+
+    // Add service to MDNS
+    MDNS.addService("http", "tcp", 80);
+    MDNS.addService("ws", "tcp", 81);
+
+    digitalWrite(LED_RED, 0);
+    digitalWrite(LED_GREEN, 0);
+    digitalWrite(LED_BLUE, 0);
+
+}
+
+void loop() {
+    webSocket.loop();
+    server.handleClient();
+}
+
diff --git a/libraries/WebSockets/library.json b/libraries/WebSockets/library.json
new file mode 100644
index 0000000..14bae5d
--- /dev/null
+++ b/libraries/WebSockets/library.json
@@ -0,0 +1,19 @@
+{
+  "name": "WebSockets",
+  "keywords": "wifi, http, web, server, client, websocket",
+  "description": "WebSocket Server and Client for Arduino based on RFC6455",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/Links2004/arduinoWebSockets.git"
+  },
+  "exclude": "tests",
+  "frameworks": "arduino",
+  "platforms": "*",
+  "authors":
+  {
+    "name": "Markus Sattler",
+    "url": "https://github.com/Links2004",
+    "maintainer": true
+  }
+}
diff --git a/libraries/WebSockets/library.properties b/libraries/WebSockets/library.properties
new file mode 100644
index 0000000..0a8fa91
--- /dev/null
+++ b/libraries/WebSockets/library.properties
@@ -0,0 +1,9 @@
+name=WebSockets
+version=2.0.4
+author=Markus Sattler
+maintainer=Markus Sattler 
+sentence=WebSockets for Arduino (Server + Client)
+paragraph=use 2.x.x for ESP and 1.3 for AVR
+category=Communication
+url=https://github.com/Links2004/arduinoWebSockets
+architectures=*
diff --git a/libraries/WebSockets/src/AsyncPrinter.cpp b/libraries/WebSockets/src/AsyncPrinter.cpp
new file mode 100644
index 0000000..dd61e76
--- /dev/null
+++ b/libraries/WebSockets/src/AsyncPrinter.cpp
@@ -0,0 +1,187 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "AsyncPrinter.h"
+
+AsyncPrinter::AsyncPrinter()
+  : _client(NULL)
+  , _data_cb(NULL)
+  , _data_arg(NULL)
+  , _close_cb(NULL)
+  , _close_arg(NULL)
+  , _tx_buffer(NULL)
+  , _tx_buffer_size(1460)
+  , next(NULL)
+{}
+
+AsyncPrinter::AsyncPrinter(AsyncClient *client, size_t txBufLen)
+  : _client(client)
+  , _data_cb(NULL)
+  , _data_arg(NULL)
+  , _close_cb(NULL)
+  , _close_arg(NULL)
+  , _tx_buffer(NULL)
+  , _tx_buffer_size(txBufLen)
+  , next(NULL)
+{
+  _attachCallbacks();
+  _tx_buffer = new cbuf(_tx_buffer_size);
+}
+
+AsyncPrinter::~AsyncPrinter(){
+  _on_close();
+}
+
+void AsyncPrinter::onData(ApDataHandler cb, void *arg){
+  _data_cb = cb;
+  _data_arg = arg;
+}
+
+void AsyncPrinter::onClose(ApCloseHandler cb, void *arg){
+  _close_cb = cb;
+  _close_arg = arg;
+}
+
+int AsyncPrinter::connect(IPAddress ip, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((AsyncPrinter*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(ip, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+int AsyncPrinter::connect(const char *host, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((AsyncPrinter*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(host, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+void AsyncPrinter::_onConnect(AsyncClient *c){
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  _tx_buffer = new cbuf(_tx_buffer_size);
+  _attachCallbacks();
+}
+
+AsyncPrinter::operator bool(){ return connected(); }
+
+AsyncPrinter & AsyncPrinter::operator=(const AsyncPrinter &other){
+  if(_client != NULL){
+    _client->close(true);
+    _client = NULL;
+  }
+  _tx_buffer_size = other._tx_buffer_size;
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  _tx_buffer = new cbuf(other._tx_buffer_size);
+  _client = other._client;
+  _attachCallbacks();
+  return *this;
+}
+
+size_t AsyncPrinter::write(uint8_t data){
+  return write(&data, 1);
+}
+
+size_t AsyncPrinter::write(const uint8_t *data, size_t len){
+  if(_tx_buffer == NULL || !connected())
+    return 0;
+  size_t toWrite = 0;
+  size_t toSend = len;
+  while(_tx_buffer->room() < toSend){
+    toWrite = _tx_buffer->room();
+    _tx_buffer->write((const char*)data, toWrite);
+    while(!_client->canSend())
+      delay(0);
+    _sendBuffer();
+    toSend -= toWrite;
+  }
+  _tx_buffer->write((const char*)(data+(len - toSend)), toSend);
+  while(!_client->canSend()) delay(0);
+  _sendBuffer();
+  return len;
+}
+
+bool AsyncPrinter::connected(){
+  return (_client != NULL && _client->connected());
+}
+
+void AsyncPrinter::close(){
+  if(_client != NULL)
+    _client->close(true);
+}
+
+size_t AsyncPrinter::_sendBuffer(){
+  size_t available = _tx_buffer->available();
+  if(!connected() || !_client->canSend() || available == 0)
+    return 0;
+  size_t sendable = _client->space();
+  if(sendable < available)
+    available= sendable;
+  char *out = new char[available];
+  _tx_buffer->read(out, available);
+  size_t sent = _client->write(out, available);
+  delete out;
+  return sent;
+}
+
+void AsyncPrinter::_onData(void *data, size_t len){
+  if(_data_cb)
+    _data_cb(_data_arg, this, (uint8_t*)data, len);
+}
+
+void AsyncPrinter::_on_close(){
+  if(_client != NULL){
+    _client = NULL;
+  }
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  if(_close_cb)
+    _close_cb(_close_arg, this);
+}
+
+void AsyncPrinter::_attachCallbacks(){
+  _client->onPoll([](void *obj, AsyncClient* c){ ((AsyncPrinter*)(obj))->_sendBuffer(); }, this);
+  _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time){ ((AsyncPrinter*)(obj))->_sendBuffer(); }, this);
+  _client->onDisconnect([](void *obj, AsyncClient* c){ ((AsyncPrinter*)(obj))->_on_close(); delete c; }, this);
+  _client->onData([](void *obj, AsyncClient* c, void *data, size_t len){ ((AsyncPrinter*)(obj))->_onData(data, len); }, this);
+}
diff --git a/libraries/WebSockets/src/AsyncPrinter.h b/libraries/WebSockets/src/AsyncPrinter.h
new file mode 100644
index 0000000..1fa0f8b
--- /dev/null
+++ b/libraries/WebSockets/src/AsyncPrinter.h
@@ -0,0 +1,73 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ASYNCPRINTER_H_
+#define ASYNCPRINTER_H_
+
+#include "Arduino.h"
+#include "ESPAsyncTCP.h"
+#include "cbuf.h"
+
+class AsyncPrinter;
+
+typedef std::function<void(void*, AsyncPrinter*, uint8_t*, size_t)> ApDataHandler;
+typedef std::function<void(void*, AsyncPrinter*)> ApCloseHandler;
+
+class AsyncPrinter: public Print {
+  private:
+    AsyncClient *_client;
+    ApDataHandler _data_cb;
+    void *_data_arg;
+    ApCloseHandler _close_cb;
+    void *_close_arg;
+    cbuf *_tx_buffer;
+    size_t _tx_buffer_size;
+
+    void _onConnect(AsyncClient *c);
+  public:
+    AsyncPrinter *next;
+
+    AsyncPrinter();
+    AsyncPrinter(AsyncClient *client, size_t txBufLen = 1460);
+    virtual ~AsyncPrinter();
+
+    int connect(IPAddress ip, uint16_t port);
+    int connect(const char *host, uint16_t port);
+
+    void onData(ApDataHandler cb, void *arg);
+    void onClose(ApCloseHandler cb, void *arg);
+
+    operator bool();
+    AsyncPrinter & operator=(const AsyncPrinter &other);
+
+    size_t write(uint8_t data);
+    size_t write(const uint8_t *data, size_t len);
+
+    bool connected();
+    void close();
+
+    size_t _sendBuffer();
+    void _onData(void *data, size_t len);
+    void _on_close();
+    void _attachCallbacks();
+};
+
+#endif /* ASYNCPRINTER_H_ */
diff --git a/libraries/WebSockets/src/ESPAsyncTCP.cpp b/libraries/WebSockets/src/ESPAsyncTCP.cpp
new file mode 100644
index 0000000..a894cf8
--- /dev/null
+++ b/libraries/WebSockets/src/ESPAsyncTCP.cpp
@@ -0,0 +1,673 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "Arduino.h"
+
+#include "ESPAsyncTCP.h"
+extern "C"{
+  #include "lwip/opt.h"
+  #include "lwip/tcp.h"
+  //#include "lwip/tcp_impl.h"
+  #include "lwip/inet.h"
+}
+
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#elif defined(ESP31B)
+#include <ESP31BWiFi.h>
+#else
+#error "UNSUPPORTED ARCHITECTURE"
+#endif
+
+
+static uint16_t _localPort = 10000;
+
+/*
+  Async TCP Client
+*/
+
+AsyncClient::AsyncClient(tcp_pcb* pcb):
+  _connect_cb(0)
+  , _connect_cb_arg(0)
+  , _discard_cb(0)
+  , _discard_cb_arg(0)
+  , _sent_cb(0)
+  , _sent_cb_arg(0)
+  , _error_cb(0)
+  , _error_cb_arg(0)
+  , _recv_cb(0)
+  , _recv_cb_arg(0)
+  , _timeout_cb(0)
+  , _timeout_cb_arg(0)
+  , _refcnt(0)
+  , _pcb_busy(false)
+  , _pcb_sent_at(0)
+  , _close_pcb(false)
+  , _ack_pcb(true)
+  , _rx_last_packet(0)
+  , _rx_since_timeout(0)
+  , prev(NULL)
+  , next(NULL)
+{
+  _pcb = pcb;
+  if(_pcb){
+    tcp_setprio(_pcb, TCP_PRIO_MIN);
+    tcp_arg(_pcb, this);
+    tcp_recv(_pcb, &_s_recv);
+    tcp_sent(_pcb, &_s_sent);
+    tcp_err(_pcb, &_s_error);
+    tcp_poll(_pcb, &_s_poll, 1);
+  }
+}
+
+AsyncClient::~AsyncClient(){
+  if(_pcb)
+    _close();
+}
+
+bool AsyncClient::connect(IPAddress ip, uint16_t port){
+  ip_addr_t addr;
+  addr.addr = ip;
+
+  if (_pcb) //already connected
+    return false;
+
+  netif* interface = ip_route(&addr);
+  if (!interface) //no route to host
+    return false;
+
+  tcp_pcb* pcb = tcp_new();
+  if (!pcb) //could not allocate pcb
+    return false;
+
+  //pcb->local_port = _localPort++;
+
+  tcp_arg(pcb, this);
+  tcp_err(pcb, &_s_error);
+  tcp_connect(pcb, &addr, port,(tcp_connected_fn)&_s_connected);
+  return true;
+}
+
+AsyncClient& AsyncClient::operator=(const AsyncClient& other){
+  if (_pcb)
+    _close();
+
+  _pcb = other._pcb;
+  if (_pcb) {
+    tcp_setprio(_pcb, TCP_PRIO_MIN);
+    tcp_arg(_pcb, this);
+    tcp_recv(_pcb, &_s_recv);
+    tcp_sent(_pcb, &_s_sent);
+    tcp_err(_pcb, &_s_error);
+    tcp_poll(_pcb, &_s_poll, 1);
+  }
+  return *this;
+}
+
+bool AsyncClient::operator==(const AsyncClient &other) {
+#ifdef ESP8266
+  return (_pcb != NULL && other._pcb != NULL && (_pcb->remote_ip.addr == other._pcb->remote_ip.addr) && (_pcb->remote_port == other._pcb->remote_port));
+#else
+  return (_pcb != NULL && other._pcb != NULL && (_pcb->remote_ip.ip4.addr == other._pcb->remote_ip.ip4.addr) && (_pcb->remote_port == other._pcb->remote_port));
+#endif
+}
+
+int8_t AsyncClient::abort(){
+  if(_pcb) {
+    tcp_abort(_pcb);
+    _pcb = NULL;
+  }
+  return ERR_ABRT;
+}
+
+void AsyncClient::close(bool now){
+  tcp_recved(_pcb, _rx_ack_len);
+  if(now)
+    _close();
+  else
+    _close_pcb = true;
+}
+
+void AsyncClient::stop() {
+  close(false);
+}
+
+bool AsyncClient::free(){
+  if(!_pcb)
+    return true;
+  if(_pcb->state == 0 || _pcb->state > 4)
+    return true;
+  return false;
+}
+
+size_t AsyncClient::write(const char* data) {
+  if(data == NULL)
+    return 0;
+  return write(data, strlen(data));
+}
+
+size_t AsyncClient::write(const char* data, size_t size) {
+  if(!_pcb || size == 0 || data == NULL)
+    return 0;
+  if(!canSend())
+    return 0;
+  size_t room = tcp_sndbuf(_pcb);
+  size_t will_send = (room < size) ? room : size;
+  int8_t err = tcp_write(_pcb, data, will_send, 0);
+  if(err != ERR_OK)
+    return 0;
+  err = tcp_output(_pcb);
+  if(err != ERR_OK)
+    return 0;
+  _pcb_sent_at = millis();
+  _pcb_busy = true;
+  if(will_send < size){
+    size_t left = size - will_send;
+    return will_send + write(data+will_send, left);
+  }
+  return size;
+}
+
+size_t AsyncClient::add(const char* data, size_t size) {
+  if(!_pcb || size == 0 || data == NULL)
+    return 0;
+  size_t room = tcp_sndbuf(_pcb);
+  if(!room)
+    return 0;
+  size_t will_send = (room < size) ? room : size;
+  int8_t err = tcp_write(_pcb, data, will_send, 0);
+  if(err != ERR_OK)
+    return 0;
+  return will_send;
+}
+
+bool AsyncClient::send(){
+  if(!canSend())
+    return false;
+  if(tcp_output(_pcb) == ERR_OK){
+    _pcb_busy = true;
+    _pcb_sent_at = millis();
+    return true;
+  }
+  return false;
+}
+
+size_t AsyncClient::ack(size_t len){
+  if(len > _rx_ack_len)
+    len = _rx_ack_len;
+  if(len)
+    tcp_recved(_pcb, len);
+  _rx_ack_len -= len;
+  return len;
+}
+
+// Private Callbacks
+
+int8_t AsyncClient::_close(){
+  int8_t err = ERR_OK;
+  if(_pcb) {
+    tcp_arg(_pcb, NULL);
+    tcp_sent(_pcb, NULL);
+    tcp_recv(_pcb, NULL);
+    tcp_err(_pcb, NULL);
+    tcp_poll(_pcb, NULL, 0);
+    err = tcp_close(_pcb);
+    if(err != ERR_OK) {
+      err = abort();
+    }
+    _pcb = NULL;
+    if(_discard_cb)
+      _discard_cb(_discard_cb_arg, this);
+  }
+  return err;
+}
+
+int8_t AsyncClient::_connected(void* pcb, int8_t err){
+  _pcb = reinterpret_cast<tcp_pcb*>(pcb);
+  if(_pcb){
+    tcp_setprio(_pcb, TCP_PRIO_MIN);
+    tcp_recv(_pcb, &_s_recv);
+    tcp_sent(_pcb, &_s_sent);
+    tcp_poll(_pcb, &_s_poll, 1);
+    _pcb_busy = false;
+  }
+  if(_connect_cb)
+    _connect_cb(_connect_cb_arg, this);
+  return ERR_OK;
+}
+
+void AsyncClient::_error(int8_t err) {
+  if(_pcb){
+    tcp_arg(_pcb, NULL);
+    tcp_sent(_pcb, NULL);
+    tcp_recv(_pcb, NULL);
+    tcp_err(_pcb, NULL);
+    tcp_poll(_pcb, NULL, 0);
+    _pcb = NULL;
+  }
+  if(_error_cb)
+    _error_cb(_error_cb_arg, this, err);
+  if(_discard_cb)
+    _discard_cb(_discard_cb_arg, this);
+}
+
+int8_t AsyncClient::_sent(tcp_pcb* pcb, uint16_t len) {
+  _rx_last_packet = millis();
+  _pcb_busy = false;
+  if(_sent_cb)
+    _sent_cb(_sent_cb_arg, this, len, (millis() - _pcb_sent_at));
+  return ERR_OK;
+}
+
+int8_t AsyncClient::_recv(tcp_pcb* pcb, pbuf* pb, int8_t err) {
+  if(pb == 0){
+    return _close();
+  }
+
+  _rx_last_packet = millis();
+  //use callback (onData defined)
+  while(pb != NULL){
+    //we should not ack before we assimilate the data
+    _ack_pcb = true;
+    pbuf *b = pb;
+    if(_recv_cb)
+      _recv_cb(_recv_cb_arg, this, b->payload, b->len);
+    if(!_ack_pcb)
+      _rx_ack_len += b->len;
+    else
+      tcp_recved(pcb, b->len);
+    //pb = pbuf_dechain(b);
+    pb = b->next;
+    b->next = NULL;
+    pbuf_free(b);
+  }
+  return ERR_OK;
+}
+
+int8_t AsyncClient::_poll(tcp_pcb* pcb){
+  // Close requested
+  if(_close_pcb){
+    _close_pcb = false;
+    _close();
+    return ERR_OK;
+  }
+  uint32_t now = millis();
+  // ACK Timeout
+  if(_pcb_busy && (now - _pcb_sent_at) >= ASYNC_MAX_ACK_TIME){
+    _pcb_busy = false;
+    if(_timeout_cb)
+      _timeout_cb(_timeout_cb_arg, this, (now - _pcb_sent_at));
+    return ERR_OK;
+  }
+  // RX Timeout
+  if(_rx_since_timeout && now - _rx_last_packet >= _rx_since_timeout * 1000){
+    _close();
+    return ERR_OK;
+  }
+  // Everything is fine
+  if(_poll_cb)
+    _poll_cb(_poll_cb_arg, this);
+  return ERR_OK;
+}
+
+// lWIP Callbacks
+
+int8_t AsyncClient::_s_poll(void *arg, struct tcp_pcb *tpcb) {
+  return reinterpret_cast<AsyncClient*>(arg)->_poll(tpcb);
+}
+
+int8_t AsyncClient::_s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, int8_t err) {
+  return reinterpret_cast<AsyncClient*>(arg)->_recv(tpcb, pb, err);
+}
+
+void AsyncClient::_s_error(void *arg, int8_t err) {
+  reinterpret_cast<AsyncClient*>(arg)->_error(err);
+}
+
+int8_t AsyncClient::_s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len) {
+  return reinterpret_cast<AsyncClient*>(arg)->_sent(tpcb, len);
+}
+
+int8_t AsyncClient::_s_connected(void* arg, void* tpcb, int8_t err){
+    return reinterpret_cast<AsyncClient*>(arg)->_connected(tpcb, err);
+}
+
+// Operators
+
+AsyncClient & AsyncClient::operator+=(const AsyncClient &other) {
+  if(next == NULL){
+    next = (AsyncClient*)(&other);
+    next->prev = this;
+  } else {
+    AsyncClient *c = next;
+    while(c->next != NULL) c = c->next;
+    c->next =(AsyncClient*)(&other);
+    c->next->prev = c;
+  }
+  return *this;
+}
+
+
+// Make this async
+bool AsyncClient::connect(const char* host, uint16_t port){
+  IPAddress remote_addr;
+  if (WiFi.hostByName(host, remote_addr))
+    return connect(remote_addr, port);
+  return false;
+}
+
+void AsyncClient::setRxTimeout(uint32_t timeout){
+  _rx_since_timeout = timeout;
+}
+
+uint32_t AsyncClient::getRxTimeout(){
+  return _rx_since_timeout;
+}
+
+void AsyncClient::setNoDelay(bool nodelay){
+  if(!_pcb)
+    return;
+  if(nodelay)
+    tcp_nagle_disable(_pcb);
+  else
+    tcp_nagle_enable(_pcb);
+}
+
+bool AsyncClient::getNoDelay(){
+  if(!_pcb)
+    return false;
+  return tcp_nagle_disabled(_pcb);
+}
+
+uint32_t AsyncClient::getRemoteAddress() {
+  if(!_pcb)
+    return 0;
+#ifdef ESP8266
+  return _pcb->remote_ip.addr;
+#else
+  return _pcb->remote_ip.ip4.addr;
+#endif
+}
+
+uint16_t AsyncClient::getRemotePort() {
+  if(!_pcb)
+    return 0;
+  return _pcb->remote_port;
+}
+
+uint32_t AsyncClient::getLocalAddress() {
+  if(!_pcb)
+    return 0;
+#ifdef ESP8266
+  return _pcb->local_ip.addr;
+#else
+  return _pcb->local_ip.ip4.addr;
+#endif
+}
+
+uint16_t AsyncClient::getLocalPort() {
+  if(!_pcb)
+    return 0;
+  return _pcb->local_port;
+}
+
+IPAddress AsyncClient::remoteIP() {
+  return IPAddress(getRemoteAddress());
+}
+
+uint16_t AsyncClient::remotePort() {
+  return getRemotePort();
+}
+
+IPAddress AsyncClient::localIP() {
+  return IPAddress(getLocalAddress());
+}
+
+uint16_t AsyncClient::localPort() {
+  return getLocalPort();
+}
+
+uint8_t AsyncClient::state() {
+  if(!_pcb)
+    return 0;
+  return _pcb->state;
+}
+
+bool AsyncClient::connected(){
+  if (!_pcb)
+    return false;
+  return _pcb->state == 4;
+}
+
+bool AsyncClient::connecting(){
+  if (!_pcb)
+    return false;
+  return _pcb->state > 0 && _pcb->state < 4;
+}
+
+bool AsyncClient::disconnecting(){
+  if (!_pcb)
+    return false;
+  return _pcb->state > 4 && _pcb->state < 10;
+}
+
+bool AsyncClient::disconnected(){
+  if (!_pcb)
+    return true;
+  return _pcb->state == 0 || _pcb->state == 10;
+}
+
+bool AsyncClient::freeable(){
+  if (!_pcb)
+    return true;
+  return _pcb->state == 0 || _pcb->state > 4;
+}
+
+bool AsyncClient::canSend(){
+  return space() > 0;
+}
+
+
+// Callback Setters
+
+void AsyncClient::onConnect(AcConnectHandler cb, void* arg){
+  _connect_cb = cb;
+  _connect_cb_arg = arg;
+}
+
+void AsyncClient::onDisconnect(AcConnectHandler cb, void* arg){
+  _discard_cb = cb;
+  _discard_cb_arg = arg;
+}
+
+void AsyncClient::onAck(AcAckHandler cb, void* arg){
+  _sent_cb = cb;
+  _sent_cb_arg = arg;
+}
+
+void AsyncClient::onError(AcErrorHandler cb, void* arg){
+  _error_cb = cb;
+  _error_cb_arg = arg;
+}
+
+void AsyncClient::onData(AcDataHandler cb, void* arg){
+  _recv_cb = cb;
+  _recv_cb_arg = arg;
+}
+
+void AsyncClient::onTimeout(AcTimeoutHandler cb, void* arg){
+  _timeout_cb = cb;
+  _timeout_cb_arg = arg;
+}
+
+void AsyncClient::onPoll(AcConnectHandler cb, void* arg){
+  _poll_cb = cb;
+  _poll_cb_arg = arg;
+}
+
+
+size_t AsyncClient::space(){
+  if((_pcb != NULL) && (_pcb->state == 4))
+    return _pcb->snd_buf;
+  return 0;
+}
+
+const char * AsyncClient::errorToString(int8_t error){
+  switch(error){
+    case 0: return "OK";
+    case -1: return "Out of memory error";
+    case -2: return "Buffer error";
+    case -3: return "Timeout";
+    case -4: return "Routing problem";
+    case -5: return "Operation in progress";
+    case -6: return "Illegal value";
+    case -7: return "Operation would block";
+    case -8: return "Connection aborted";
+    case -9: return "Connection reset";
+    case -10: return "Connection closed";
+    case -11: return "Not connected";
+    case -12: return "Illegal argument";
+    case -13: return "Address in use";
+    case -14: return "Low-level netif error";
+    case -15: return "Already connected";
+    default: return "UNKNOWN";
+  }
+}
+
+const char * AsyncClient::stateToString(){
+  switch(state()){
+    case 0: return "Closed";
+    case 1: return "Listen";
+    case 2: return "SYN Sent";
+    case 3: return "SYN Received";
+    case 4: return "Established";
+    case 5: return "FIN Wait 1";
+    case 6: return "FIN Wait 2";
+    case 7: return "Close Wait";
+    case 8: return "Closing";
+    case 9: return "Last ACK";
+    case 10: return "Time Wait";
+    default: return "UNKNOWN";
+  }
+}
+
+/*
+  Async TCP Server
+*/
+
+AsyncServer::AsyncServer(IPAddress addr, uint16_t port)
+  : _port(port)
+  , _addr(addr)
+  , _noDelay(false)
+  , _pcb(0)
+  , _connect_cb(0)
+  , _connect_cb_arg(0)
+{}
+
+AsyncServer::AsyncServer(uint16_t port)
+  : _port(port)
+  , _addr((uint32_t) IPADDR_ANY)
+  , _noDelay(false)
+  , _pcb(0)
+  , _connect_cb(0)
+  , _connect_cb_arg(0)
+{}
+
+AsyncServer::~AsyncServer(){}
+
+void AsyncServer::onClient(AcConnectHandler cb, void* arg){
+  _connect_cb = cb;
+  _connect_cb_arg = arg;
+}
+
+void AsyncServer::begin(){
+  if(_pcb)
+    return;
+
+  int8_t err;
+  tcp_pcb* pcb = tcp_new();
+  if (!pcb)
+    return;
+
+  ip_addr_t local_addr;
+  local_addr.addr = (uint32_t) _addr;
+  err = tcp_bind(pcb, &local_addr, _port);
+
+  if (err != ERR_OK) {
+    tcp_close(pcb);
+    return;
+  }
+
+  tcp_pcb* listen_pcb = tcp_listen(pcb);
+  if (!listen_pcb) {
+    tcp_close(pcb);
+    return;
+  }
+  _pcb = listen_pcb;
+  tcp_arg(_pcb, (void*) this);
+  tcp_accept(_pcb, _s_accept);
+}
+
+void AsyncServer::end(){
+  if(_pcb){
+    //cleanup all connections?
+    tcp_abort(_pcb);
+    tcp_arg(_pcb, NULL);
+    tcp_accept(_pcb, NULL);
+    _pcb = NULL;
+  }
+}
+
+void AsyncServer::setNoDelay(bool nodelay){
+  _noDelay = nodelay;
+}
+
+bool AsyncServer::getNoDelay(){
+  return _noDelay;
+}
+
+uint8_t AsyncServer::status(){
+  if (!_pcb)
+    return 0;
+  return _pcb->state;
+}
+
+int8_t AsyncServer::_accept(tcp_pcb* pcb, int8_t err){
+  if(_connect_cb){
+    if (_noDelay)
+      tcp_nagle_disable(pcb);
+    else
+      tcp_nagle_enable(pcb);
+    AsyncClient *c = new AsyncClient(pcb);
+    if(c){
+      _connect_cb(_connect_cb_arg, c);
+      return ERR_OK;
+    }
+  }
+  if(tcp_close(pcb) != ERR_OK){
+    tcp_abort(pcb);
+  }
+  return ERR_OK;
+}
+
+int8_t AsyncServer::_s_accept(void *arg, tcp_pcb* pcb, int8_t err){
+  return reinterpret_cast<AsyncServer*>(arg)->_accept(pcb, err);
+}
diff --git a/libraries/WebSockets/src/ESPAsyncTCP.h b/libraries/WebSockets/src/ESPAsyncTCP.h
new file mode 100644
index 0000000..ccc8d46
--- /dev/null
+++ b/libraries/WebSockets/src/ESPAsyncTCP.h
@@ -0,0 +1,179 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef ASYNCTCP_H_
+#define ASYNCTCP_H_
+
+
+
+#include "IPAddress.h"
+#include <functional>
+
+#define USE_ASYNC_BUFFER 0
+#define SERVER_KEEP_CLIENTS 0
+#define CLIENT_SYNC_API 0
+
+class AsyncClient;
+
+#define ASYNC_MAX_ACK_TIME 5000
+
+typedef std::function<void(void*, AsyncClient*)> AcConnectHandler;
+typedef std::function<void(void*, AsyncClient*, size_t len, uint32_t time)> AcAckHandler;
+typedef std::function<void(void*, AsyncClient*, int8_t error)> AcErrorHandler;
+typedef std::function<void(void*, AsyncClient*, void *data, size_t len)> AcDataHandler;
+typedef std::function<void(void*, AsyncClient*, uint32_t time)> AcTimeoutHandler;
+
+struct tcp_pcb;
+struct pbuf;
+
+class AsyncClient {
+  protected:
+    friend class AsyncTCPbuffer;
+    tcp_pcb* _pcb;
+    AcConnectHandler _connect_cb;
+    void* _connect_cb_arg;
+    AcConnectHandler _discard_cb;
+    void* _discard_cb_arg;
+    AcAckHandler _sent_cb;
+    void* _sent_cb_arg;
+    AcErrorHandler _error_cb;
+    void* _error_cb_arg;
+    AcDataHandler _recv_cb;
+    void* _recv_cb_arg;
+    AcTimeoutHandler _timeout_cb;
+    void* _timeout_cb_arg;
+    AcConnectHandler _poll_cb;
+    void* _poll_cb_arg;
+    int _refcnt;
+    bool _pcb_busy;
+    uint32_t _pcb_sent_at;
+    bool _close_pcb;
+    bool _ack_pcb;
+    uint32_t _rx_ack_len;
+    uint32_t _rx_last_packet;
+    uint32_t _rx_since_timeout;
+
+    int8_t _close();
+    int8_t _connected(void* pcb, int8_t err);
+    void _error(int8_t err);
+    int8_t _poll(tcp_pcb* pcb);
+    int8_t _sent(tcp_pcb* pcb, uint16_t len);
+    int8_t _recv(tcp_pcb* pcb, pbuf* pb, int8_t err);
+    static int8_t _s_poll(void *arg, struct tcp_pcb *tpcb);
+    static int8_t _s_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *pb, int8_t err);
+    static void _s_error(void *arg, int8_t err);
+    static int8_t _s_sent(void *arg, struct tcp_pcb *tpcb, uint16_t len);
+    static int8_t _s_connected(void* arg, void* tpcb, int8_t err);
+
+  public:
+    AsyncClient* prev;
+    AsyncClient* next;
+
+    AsyncClient(tcp_pcb* pcb = 0);
+    ~AsyncClient();
+
+    AsyncClient & operator=(const AsyncClient &other);
+    AsyncClient & operator+=(const AsyncClient &other);
+
+    bool operator==(const AsyncClient &other);
+
+    bool operator!=(const AsyncClient &other) {
+      return !(*this == other);
+    }
+
+    bool connect(IPAddress ip, uint16_t port);
+    bool connect(const char* host, uint16_t port);
+    void close(bool now = false);
+    void stop();
+    int8_t abort();
+    bool free();
+
+    bool canSend();//ack is not pending
+    size_t space();
+    size_t add(const char* data, size_t size);//add for sending
+    bool send();//send all data added with the method above
+    size_t ack(size_t len); //ack data that you have not acked using the method below
+    void ackLater(){ _ack_pcb = false; } //will not ack the current packet. Call from onData
+
+
+    size_t write(const char* data);
+    size_t write(const char* data, size_t size); //only when canSend() == true
+
+    uint8_t state();
+    bool connecting();
+    bool connected();
+    bool disconnecting();
+    bool disconnected();
+    bool freeable();//disconnected or disconnecting
+
+    uint32_t getRxTimeout();
+    void setRxTimeout(uint32_t timeout);//no RX data timeout for the connection in seconds
+    void setNoDelay(bool nodelay);
+    bool getNoDelay();
+    uint32_t getRemoteAddress();
+    uint16_t getRemotePort();
+    uint32_t getLocalAddress();
+    uint16_t getLocalPort();
+
+    IPAddress remoteIP();
+    uint16_t  remotePort();
+    IPAddress localIP();
+    uint16_t  localPort();
+
+    void onConnect(AcConnectHandler cb, void* arg = 0);     //on successful connect
+    void onDisconnect(AcConnectHandler cb, void* arg = 0);  //disconnected
+    void onAck(AcAckHandler cb, void* arg = 0);             //ack received
+    void onError(AcErrorHandler cb, void* arg = 0);         //unsuccessful connect or error
+    void onData(AcDataHandler cb, void* arg = 0);           //data received
+    void onTimeout(AcTimeoutHandler cb, void* arg = 0);     //ack timeout
+    void onPoll(AcConnectHandler cb, void* arg = 0);        //every 125ms when connected
+
+    const char * errorToString(int8_t error);
+    const char * stateToString();
+};
+
+class AsyncServer {
+  protected:
+    uint16_t _port;
+    IPAddress _addr;
+    bool _noDelay;
+    tcp_pcb* _pcb;
+    AcConnectHandler _connect_cb;
+    void* _connect_cb_arg;
+
+  public:
+    AsyncServer(IPAddress addr, uint16_t port);
+    AsyncServer(uint16_t port);
+    ~AsyncServer();
+    void onClient(AcConnectHandler cb, void* arg);
+    void begin();
+    void end();
+    void setNoDelay(bool nodelay);
+    bool getNoDelay();
+    uint8_t status();
+
+  protected:
+    int8_t _accept(tcp_pcb* newpcb, int8_t err);
+    static int8_t _s_accept(void *arg, tcp_pcb* newpcb, int8_t err);
+};
+
+
+#endif /* ASYNCTCP_H_ */
diff --git a/libraries/WebSockets/src/ESPAsyncTCPbuffer.cpp b/libraries/WebSockets/src/ESPAsyncTCPbuffer.cpp
new file mode 100644
index 0000000..7bca134
--- /dev/null
+++ b/libraries/WebSockets/src/ESPAsyncTCPbuffer.cpp
@@ -0,0 +1,541 @@
+/**
+ * @file  ESPAsyncTCPbuffer.cpp
+ * @date  22.01.2016
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the Asynv TCP for ESP.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+
+#include <Arduino.h>
+#include <debug.h>
+
+#include "ESPAsyncTCPbuffer.h"
+
+
+AsyncTCPbuffer::AsyncTCPbuffer(AsyncClient* client) {
+    if(client == NULL) {
+        DEBUG_ASYNC_TCP("[A-TCP] client is null!!!\n");
+        panic();
+    }
+
+    _client = client;
+    _TXbufferWrite = new cbuf(1460);
+    _TXbufferRead = _TXbufferWrite;
+    _RXbuffer = new cbuf(100);
+    _RXmode = ATB_RX_MODE_FREE;
+    _rxSize = 0;
+    _rxTerminator = 0x00;
+    _rxReadBytesPtr = NULL;
+    _rxReadStringPtr = NULL;
+    _cbDisconnect = NULL;
+
+    _cbRX = NULL;
+    _cbDone = NULL;
+    _attachCallbacks();
+}
+
+AsyncTCPbuffer::~AsyncTCPbuffer() {
+    if(_client) {
+        _client->close();
+    }
+
+    if(_RXbuffer) {
+        delete _RXbuffer;
+        _RXbuffer = NULL;
+    }
+
+    if(_TXbufferWrite) {
+        // will be deleted in _TXbufferRead chain
+        _TXbufferWrite = NULL;
+    }
+
+    if(_TXbufferRead) {
+        cbuf * next = _TXbufferRead->next;
+        delete _TXbufferRead;
+        while(next != NULL) {
+            _TXbufferRead = next;
+            next = _TXbufferRead->next;
+            delete _TXbufferRead;
+        }
+        _TXbufferRead = NULL;
+    }
+}
+
+size_t AsyncTCPbuffer::write(String & data) {
+    return write(data.c_str(), data.length());
+}
+
+size_t AsyncTCPbuffer::write(uint8_t data) {
+    return write(&data, 1);
+}
+
+size_t AsyncTCPbuffer::write(const char* data) {
+    return write((const uint8_t *) data, strlen(data));
+}
+
+size_t AsyncTCPbuffer::write(const char *data, size_t len) {
+    return write((const uint8_t *) data, len);
+}
+
+/**
+ * write data in to buffer and try to send the data
+ * @param data
+ * @param len
+ * @return
+ */
+size_t AsyncTCPbuffer::write(const uint8_t *data, size_t len) {
+    if(_TXbufferWrite == NULL || _client == NULL || !_client->connected() || data == NULL || len == 0) {
+        return 0;
+    }
+
+    size_t bytesLeft = len;
+    while(bytesLeft) {
+        size_t w = _TXbufferWrite->write((const char*) data, bytesLeft);
+        bytesLeft -= w;
+        data += w;
+        _sendBuffer();
+
+        // add new buffer since we have more data
+        if(_TXbufferWrite->full() && bytesLeft > 0) {
+
+            // to less ram!!!
+            if(ESP.getFreeHeap() < 4096) {
+                DEBUG_ASYNC_TCP("[A-TCP] run out of Heap can not send all Data!\n");
+                return (len - bytesLeft);
+            }
+
+            cbuf * next = new cbuf(1460);
+
+            if(next == NULL) {
+                DEBUG_ASYNC_TCP("[A-TCP] run out of Heap!\n");
+                panic();
+            } else {
+                DEBUG_ASYNC_TCP("[A-TCP] new cbuf\n");
+            }
+
+            // add new buffer to chain (current cbuf)
+            _TXbufferWrite->next = next;
+
+            // move ptr for next data
+            _TXbufferWrite = next;
+        }
+    }
+
+    return len;
+
+}
+
+/**
+ * wait until all data has send out
+ */
+void AsyncTCPbuffer::flush() {
+    while(!_TXbufferWrite->empty()) {
+        while(!_client->canSend()) {
+            delay(0);
+        }
+        _sendBuffer();
+    }
+}
+
+void AsyncTCPbuffer::noCallback() {
+    _RXmode = ATB_RX_MODE_NONE;
+}
+
+void AsyncTCPbuffer::readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] readStringUntil terminator: %02X\n", terminator);
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = done;
+    _rxReadStringPtr = str;
+    _rxTerminator = terminator;
+    _rxSize = 0;
+    _RXmode = ATB_RX_MODE_TERMINATOR_STRING;
+}
+
+/*
+ void AsyncTCPbuffer::readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+ _RXmode = ATB_RX_MODE_NONE;
+ _cbDone = done;
+ _rxReadBytesPtr = (uint8_t *) buffer;
+ _rxTerminator = terminator;
+ _rxSize = length;
+ _RXmode = ATB_RX_MODE_TERMINATOR;
+ _handleRxBuffer(NULL, 0);
+ }
+
+ void AsyncTCPbuffer::readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+ readBytesUntil(terminator, (char *) buffer, length, done);
+ }
+ */
+
+void AsyncTCPbuffer::readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] readBytes length: %d\n", length);
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = done;
+    _rxReadBytesPtr = (uint8_t *) buffer;
+    _rxSize = length;
+    _RXmode = ATB_RX_MODE_READ_BYTES;
+}
+
+void AsyncTCPbuffer::readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done) {
+    readBytes((char *) buffer, length, done);
+}
+
+void AsyncTCPbuffer::onData(AsyncTCPbufferDataCb cb) {
+    if(_client == NULL) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] onData\n");
+    _RXmode = ATB_RX_MODE_NONE;
+    _cbDone = NULL;
+    _cbRX = cb;
+    _RXmode = ATB_RX_MODE_FREE;
+}
+
+void AsyncTCPbuffer::onDisconnect(AsyncTCPbufferDisconnectCb cb) {
+    _cbDisconnect = cb;
+}
+
+IPAddress AsyncTCPbuffer::remoteIP() {
+    if(!_client) {
+        return IPAddress(0U);
+    }
+    return _client->remoteIP();
+}
+
+uint16_t AsyncTCPbuffer::remotePort() {
+    if(!_client) {
+        return 0;
+    }
+    return _client->remotePort();
+}
+
+bool AsyncTCPbuffer::connected() {
+    if(!_client) {
+        return false;
+    }
+    return _client->connected();
+}
+
+void AsyncTCPbuffer::stop() {
+
+    if(!_client) {
+        return;
+    }
+    _client->stop();
+    _client = NULL;
+
+    if(_cbDone) {
+        switch(_RXmode) {
+            case ATB_RX_MODE_READ_BYTES:
+            case ATB_RX_MODE_TERMINATOR:
+            case ATB_RX_MODE_TERMINATOR_STRING:
+                _RXmode = ATB_RX_MODE_NONE;
+                _cbDone(false, NULL);
+                break;
+            default:
+              break;
+        }
+    }
+    _RXmode = ATB_RX_MODE_NONE;
+}
+
+void AsyncTCPbuffer::close() {
+    stop();
+}
+
+
+///--------------------------------
+
+/**
+ * attachCallbacks to AsyncClient class
+ */
+void AsyncTCPbuffer::_attachCallbacks() {
+    if(!_client) {
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks\n");
+
+    _client->onPoll([](void *obj, AsyncClient* c) {
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        if((b->_TXbufferRead != NULL) && !b->_TXbufferRead->empty()) {
+            b->_sendBuffer();
+        }
+        //    if(!b->_RXbuffer->empty()) {
+        //       b->_handleRxBuffer(NULL, 0);
+        //   }
+    }, this);
+
+    _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time) {
+        DEBUG_ASYNC_TCP("[A-TCP] onAck\n");
+        ((AsyncTCPbuffer*)(obj))->_sendBuffer();
+    }, this);
+
+    _client->onDisconnect([](void *obj, AsyncClient* c) {
+        DEBUG_ASYNC_TCP("[A-TCP] onDisconnect\n");
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        b->_client = NULL;
+        bool del = true;
+        if(b->_cbDisconnect) {
+            del = b->_cbDisconnect(b);
+        }
+        delete c;
+        if(del) {
+            delete b;
+        }
+    }, this);
+
+    _client->onData([](void *obj, AsyncClient* c, void *buf, size_t len) {
+        AsyncTCPbuffer* b = ((AsyncTCPbuffer*)(obj));
+        b->_rxData((uint8_t *)buf, len);
+    }, this);
+
+    _client->onTimeout([](void *obj, AsyncClient* c, uint32_t time){
+        DEBUG_ASYNC_TCP("[A-TCP] onTimeout\n");
+        c->close();
+    }, this);
+
+    DEBUG_ASYNC_TCP("[A-TCP] attachCallbacks Done.\n");
+}
+
+/**
+ * send TX buffer if possible
+ */
+void AsyncTCPbuffer::_sendBuffer() {
+    //DEBUG_ASYNC_TCP("[A-TCP] _sendBuffer...\n");
+    size_t available = _TXbufferRead->available();
+    if(available == 0 || _client == NULL || !_client->connected() || !_client->canSend()) {
+        return;
+    }
+
+    while((_client->space() > 0) && (_TXbufferRead->available() > 0) && _client->canSend()) {
+
+        available = _TXbufferRead->available();
+
+        if(available > _client->space()) {
+            available = _client->space();
+        }
+
+        char *out = new char[available];
+        if(out == NULL) {
+            DEBUG_ASYNC_TCP("[A-TCP] to less heap, try later.\n");
+            return;
+        }
+
+        // read data from buffer
+        _TXbufferRead->peek(out, available);
+
+        // send data
+        size_t send = _client->write((const char*) out, available);
+        if(send != available) {
+            DEBUG_ASYNC_TCP("[A-TCP] write failed send: %d available: %d \n", send, available);
+        }
+
+        // remove really send data from buffer
+        _TXbufferRead->remove(send);
+
+        // if buffer is empty and there is a other buffer in chain delete the empty one
+        if(_TXbufferRead->available() == 0 && _TXbufferRead->next != NULL) {
+            cbuf * old = _TXbufferRead;
+            _TXbufferRead = _TXbufferRead->next;
+            delete old;
+            DEBUG_ASYNC_TCP("[A-TCP] delete cbuf\n");
+        }
+
+        delete out;
+    }
+
+}
+
+/**
+ * called on incoming data
+ * @param buf
+ * @param len
+ */
+void AsyncTCPbuffer::_rxData(uint8_t *buf, size_t len) {
+    if(!_client || !_client->connected()) {
+        DEBUG_ASYNC_TCP("[A-TCP] not connected!\n");
+        return;
+    }
+    if(!_RXbuffer) {
+        DEBUG_ASYNC_TCP("[A-TCP] _rxData no _RXbuffer!\n");
+        return;
+    }
+    DEBUG_ASYNC_TCP("[A-TCP] _rxData len: %d RXmode: %d\n", len, _RXmode);
+
+    size_t handled = 0;
+
+    if(_RXmode != ATB_RX_MODE_NONE) {
+        handled = _handleRxBuffer((uint8_t *) buf, len);
+        buf += handled;
+        len -= handled;
+
+        // handle as much as possible before using the buffer
+        if(_RXbuffer->empty()) {
+            while(_RXmode != ATB_RX_MODE_NONE && handled != 0 && len > 0) {
+                handled = _handleRxBuffer(buf, len);
+                buf += handled;
+                len -= handled;
+            }
+        }
+    }
+
+    if(len > 0) {
+
+        if(_RXbuffer->room() < len) {
+            // to less space
+            DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer full try resize\n");
+            _RXbuffer->resizeAdd((len + _RXbuffer->room()));
+
+            if(_RXbuffer->room() < len) {
+                DEBUG_ASYNC_TCP("[A-TCP] _rxData buffer to full can only handle %d!!!\n", _RXbuffer->room());
+            }
+        }
+
+        _RXbuffer->write((const char *) (buf), len);
+    }
+
+    if(!_RXbuffer->empty() && _RXmode != ATB_RX_MODE_NONE) {
+        // handle as much as possible data in buffer
+        handled = _handleRxBuffer(NULL, 0);
+        while(_RXmode != ATB_RX_MODE_NONE && handled != 0) {
+            handled = _handleRxBuffer(NULL, 0);
+        }
+    }
+
+    // clean up ram
+    if(_RXbuffer->empty() && _RXbuffer->room() != 100) {
+        _RXbuffer->resize(100);
+    }
+
+}
+
+/**
+ *
+ */
+size_t AsyncTCPbuffer::_handleRxBuffer(uint8_t *buf, size_t len) {
+    if(!_client || !_client->connected() || _RXbuffer == NULL) {
+        return 0;
+    }
+
+    DEBUG_ASYNC_TCP("[A-TCP] _handleRxBuffer len: %d RXmode: %d\n", len, _RXmode);
+
+    size_t BufferAvailable = _RXbuffer->available();
+    size_t r = 0;
+
+    if(_RXmode == ATB_RX_MODE_NONE) {
+        return 0;
+    } else if(_RXmode == ATB_RX_MODE_FREE) {
+        if(_cbRX == NULL) {
+            return 0;
+        }
+
+        if(BufferAvailable > 0) {
+            uint8_t * b = new uint8_t[BufferAvailable];
+            _RXbuffer->peek((char *) b, BufferAvailable);
+            r = _cbRX(b, BufferAvailable);
+            _RXbuffer->remove(r);
+        }
+
+        if(r == BufferAvailable && buf && (len > 0)) {
+            return _cbRX(buf, len);
+        } else {
+            return 0;
+        }
+
+    } else if(_RXmode == ATB_RX_MODE_READ_BYTES) {
+        if(_rxReadBytesPtr == NULL || _cbDone == NULL) {
+            return 0;
+        }
+
+        size_t newReadCount = 0;
+
+        if(BufferAvailable) {
+            r = _RXbuffer->read((char *) _rxReadBytesPtr, _rxSize);
+            _rxSize -= r;
+            _rxReadBytesPtr += r;
+        }
+
+        if(_RXbuffer->empty() && (len > 0) && buf) {
+            r = len;
+            if(r > _rxSize) {
+                r = _rxSize;
+            }
+            memcpy(_rxReadBytesPtr, buf, r);
+            _rxReadBytesPtr += r;
+            _rxSize -= r;
+            newReadCount += r;
+        }
+
+        if(_rxSize == 0) {
+            _RXmode = ATB_RX_MODE_NONE;
+            _cbDone(true, NULL);
+        }
+
+        // add left over bytes to Buffer
+        return newReadCount;
+
+    } else if(_RXmode == ATB_RX_MODE_TERMINATOR) {
+        // TODO implement read terminator non string
+
+    } else if(_RXmode == ATB_RX_MODE_TERMINATOR_STRING) {
+        if(_rxReadStringPtr == NULL || _cbDone == NULL) {
+            return 0;
+        }
+
+        // handle Buffer
+        if(BufferAvailable > 0) {
+            while(!_RXbuffer->empty()) {
+                char c = _RXbuffer->read();
+                if(c == _rxTerminator || c == 0x00) {
+                    _RXmode = ATB_RX_MODE_NONE;
+                    _cbDone(true, _rxReadStringPtr);
+                    return 0;
+                } else {
+                    (*_rxReadStringPtr) += c;
+                }
+            }
+        }
+
+        if(_RXbuffer->empty() && (len > 0) && buf) {
+            size_t newReadCount = 0;
+            while(newReadCount < len) {
+                char c = (char) *buf;
+                buf++;
+                newReadCount++;
+                if(c == _rxTerminator || c == 0x00) {
+                    _RXmode = ATB_RX_MODE_NONE;
+                    _cbDone(true, _rxReadStringPtr);
+                    return newReadCount;
+                } else {
+                    (*_rxReadStringPtr) += c;
+                }
+            }
+            return newReadCount;
+        }
+    }
+
+    return 0;
+}
diff --git a/libraries/WebSockets/src/ESPAsyncTCPbuffer.h b/libraries/WebSockets/src/ESPAsyncTCPbuffer.h
new file mode 100644
index 0000000..374364e
--- /dev/null
+++ b/libraries/WebSockets/src/ESPAsyncTCPbuffer.h
@@ -0,0 +1,118 @@
+/**
+ * @file ESPAsyncTCPbuffer.h
+ * @date  22.01.2016
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the Asynv TCP for ESP.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef ESPASYNCTCPBUFFER_H_
+#define ESPASYNCTCPBUFFER_H_
+
+//#define DEBUG_ASYNC_TCP(...)  while(((U0S >> USTXC) & 0x7F) != 0x00); os_printf( __VA_ARGS__ ); while(((U0S >> USTXC) & 0x7F) != 0x00)
+
+#ifndef DEBUG_ASYNC_TCP
+#define DEBUG_ASYNC_TCP(...)
+#endif
+
+#include <Arduino.h>
+#include <cbuf.h>
+
+#include "ESPAsyncTCP.h"
+
+
+
+typedef enum {
+    ATB_RX_MODE_NONE,
+    ATB_RX_MODE_FREE,
+    ATB_RX_MODE_READ_BYTES,
+    ATB_RX_MODE_TERMINATOR,
+    ATB_RX_MODE_TERMINATOR_STRING
+} atbRxMode_t;
+
+class AsyncTCPbuffer: public Print {
+
+    public:
+
+        typedef std::function<size_t(uint8_t * payload, size_t length)> AsyncTCPbufferDataCb;
+        typedef std::function<void(bool ok, void * ret)> AsyncTCPbufferDoneCb;
+        typedef std::function<bool(AsyncTCPbuffer * obj)> AsyncTCPbufferDisconnectCb;
+
+        AsyncTCPbuffer(AsyncClient* c);
+        virtual ~AsyncTCPbuffer();
+
+        size_t write(String & data);
+        size_t write(uint8_t data);
+        size_t write(const char* data);
+        size_t write(const char *data, size_t len);
+        size_t write(const uint8_t *data, size_t len);
+
+        void flush();
+
+        void noCallback();
+
+        void readStringUntil(char terminator, String * str, AsyncTCPbufferDoneCb done);
+
+        // TODO implement read terminator non string
+        //void readBytesUntil(char terminator, char *buffer, size_t length, AsyncTCPbufferDoneCb done);
+        //void readBytesUntil(char terminator, uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done);
+
+        void readBytes(char *buffer, size_t length, AsyncTCPbufferDoneCb done);
+        void readBytes(uint8_t *buffer, size_t length, AsyncTCPbufferDoneCb done);
+
+        // TODO implement
+        // void setTimeout(size_t timeout);
+
+        void onData(AsyncTCPbufferDataCb cb);
+        void onDisconnect(AsyncTCPbufferDisconnectCb cb);
+
+        IPAddress remoteIP();
+        uint16_t  remotePort();
+        IPAddress localIP();
+        uint16_t  localPort();
+
+        bool connected();
+
+        void stop();
+        void close();
+
+    protected:
+        AsyncClient* _client;
+        cbuf * _TXbufferRead;
+        cbuf * _TXbufferWrite;
+        cbuf * _RXbuffer;
+        atbRxMode_t _RXmode;
+        size_t _rxSize;
+        char _rxTerminator;
+        uint8_t * _rxReadBytesPtr;
+        String * _rxReadStringPtr;
+
+        AsyncTCPbufferDataCb _cbRX;
+        AsyncTCPbufferDoneCb _cbDone;
+        AsyncTCPbufferDisconnectCb _cbDisconnect;
+
+        void _attachCallbacks();
+        void _sendBuffer();
+        void _on_close();
+        void _rxData(uint8_t *buf, size_t len);
+        size_t _handleRxBuffer(uint8_t *buf, size_t len);
+
+};
+
+#endif /* ESPASYNCTCPBUFFER_H_ */
diff --git a/libraries/WebSockets/src/SyncClient.cpp b/libraries/WebSockets/src/SyncClient.cpp
new file mode 100644
index 0000000..9bd3c47
--- /dev/null
+++ b/libraries/WebSockets/src/SyncClient.cpp
@@ -0,0 +1,261 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include "SyncClient.h"
+#include "Arduino.h"
+#include "ESPAsyncTCP.h"
+#include "cbuf.h"
+
+
+SyncClient::SyncClient(size_t txBufLen)
+  : _client(NULL)
+  , _tx_buffer(NULL)
+  , _tx_buffer_size(txBufLen)
+  , _rx_buffer(NULL)
+{}
+
+SyncClient::SyncClient(AsyncClient *client, size_t txBufLen)
+  : _client(client)
+  , _tx_buffer(new cbuf(txBufLen))
+  , _tx_buffer_size(txBufLen)
+  , _rx_buffer(NULL)
+{
+  _attachCallbacks();
+}
+
+SyncClient::~SyncClient(){
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  while(_rx_buffer != NULL){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = _rx_buffer->next;
+    delete b;
+  }
+}
+
+int SyncClient::connect(IPAddress ip, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((SyncClient*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(ip, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+int SyncClient::connect(const char *host, uint16_t port){
+  if(_client != NULL && connected())
+    return 0;
+  _client = new AsyncClient();
+  _client->onConnect([](void *obj, AsyncClient *c){ ((SyncClient*)(obj))->_onConnect(c); }, this);
+  if(_client->connect(host, port)){
+    while(_client->state() < 4)
+      delay(1);
+    return connected();
+  }
+  return 0;
+}
+
+SyncClient & SyncClient::operator=(const SyncClient &other){
+  if(_client != NULL){
+    _client->abort();
+    _client->free();
+    _client = NULL;
+  }
+  _tx_buffer_size = other._tx_buffer_size;
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  while(_rx_buffer != NULL){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = b->next;
+    delete b;
+  }
+  _tx_buffer = new cbuf(other._tx_buffer_size);
+  _client = other._client;
+  _attachCallbacks();
+  return *this;
+}
+
+void SyncClient::setTimeout(uint32_t seconds){
+  if(_client != NULL)
+    _client->setRxTimeout(seconds);
+}
+
+uint8_t SyncClient::status(){
+  if(_client == NULL)
+    return 0;
+  return _client->state();
+}
+
+uint8_t SyncClient::connected(){
+  return (_client != NULL && _client->connected());
+}
+
+void SyncClient::stop(){
+  if(_client != NULL)
+    _client->close(true);
+}
+
+size_t SyncClient::_sendBuffer(){
+  size_t available = _tx_buffer->available();
+  if(!connected() || !_client->canSend() || available == 0)
+    return 0;
+  size_t sendable = _client->space();
+  if(sendable < available)
+    available= sendable;
+  char *out = new char[available];
+  _tx_buffer->read(out, available);
+  size_t sent = _client->write(out, available);
+  delete[] out;
+  return sent;
+}
+
+void SyncClient::_onData(void *data, size_t len){
+  _client->ackLater();
+  cbuf *b = new cbuf(len+1);
+  if(b != NULL){
+    b->write((const char *)data, len);
+    if(_rx_buffer == NULL)
+      _rx_buffer = b;
+    else {
+      cbuf *p = _rx_buffer;
+      while(p->next != NULL)
+        p = p->next;
+      p->next = b;
+    }
+  }
+}
+
+void SyncClient::_onDisconnect(){
+  if(_client != NULL){
+    _client = NULL;
+  }
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  while(_rx_buffer != NULL){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = b->next;
+    delete b;
+  }
+}
+
+void SyncClient::_onConnect(AsyncClient *c){
+  if(_tx_buffer != NULL){
+    cbuf *b = _tx_buffer;
+    _tx_buffer = NULL;
+    delete b;
+  }
+  _tx_buffer = new cbuf(_tx_buffer_size);
+  _attachCallbacks();
+}
+
+void SyncClient::_attachCallbacks(){
+  _client->onAck([](void *obj, AsyncClient* c, size_t len, uint32_t time){ ((SyncClient*)(obj))->_sendBuffer(); }, this);
+  _client->onDisconnect([](void *obj, AsyncClient* c){ ((SyncClient*)(obj))->_onDisconnect(); delete c; }, this);
+  _client->onData([](void *obj, AsyncClient* c, void *data, size_t len){ ((SyncClient*)(obj))->_onData(data, len); }, this);
+  _client->onTimeout([](void *obj, AsyncClient* c, uint32_t time){ c->close(); }, this);
+}
+
+size_t SyncClient::write(uint8_t data){
+  return write(&data, 1);
+}
+
+size_t SyncClient::write(const uint8_t *data, size_t len){
+  if(_tx_buffer == NULL || !connected()){
+    return 0;
+  }
+  size_t toWrite = 0;
+  size_t toSend = len;
+  while(_tx_buffer->room() < toSend){
+    toWrite = _tx_buffer->room();
+    _tx_buffer->write((const char*)data, toWrite);
+    while(!_client->canSend() && connected())
+      delay(0);
+    _sendBuffer();
+    toSend -= toWrite;
+  }
+  _tx_buffer->write((const char*)(data+(len - toSend)), toSend);
+  if(_client->canSend() && connected())
+    _sendBuffer();
+  return len;
+}
+
+int SyncClient::available(){
+  if(_rx_buffer == NULL) return 0;
+  size_t a = 0;
+  cbuf *b = _rx_buffer;
+  while(b != NULL){
+    a += b->available();
+    b = b->next;
+  }
+  return a;
+}
+
+int SyncClient::peek(){
+  if(_rx_buffer == NULL) return -1;
+  return _rx_buffer->peek();
+}
+
+int SyncClient::read(uint8_t *data, size_t len){
+  if(_rx_buffer == NULL) return -1;
+
+  size_t readSoFar = 0;
+  while(_rx_buffer != NULL && (len - readSoFar) >= _rx_buffer->available()){
+    cbuf *b = _rx_buffer;
+    _rx_buffer = _rx_buffer->next;
+    size_t toRead = b->available();
+    readSoFar += b->read((char*)(data+readSoFar), toRead);
+    _client->ack(b->size() - 1);
+    delete b;
+  }
+  if(_rx_buffer != NULL && readSoFar < len){
+    readSoFar += _rx_buffer->read((char*)(data+readSoFar), (len - readSoFar));
+  }
+  return readSoFar;
+}
+
+int SyncClient::read(){
+  uint8_t res = 0;
+  if(read(&res, 1) != 1)
+    return -1;
+  return res;
+}
+
+void SyncClient::flush(){
+  if(_tx_buffer == NULL || !connected())
+    return;
+  if(_tx_buffer->available()){
+    while(!_client->canSend() && connected())
+      delay(0);
+    _sendBuffer();
+  }
+}
diff --git a/libraries/WebSockets/src/SyncClient.h b/libraries/WebSockets/src/SyncClient.h
new file mode 100644
index 0000000..7f1c4ee
--- /dev/null
+++ b/libraries/WebSockets/src/SyncClient.h
@@ -0,0 +1,68 @@
+/*
+  Asynchronous TCP library for Espressif MCUs
+
+  Copyright (c) 2016 Hristo Gochkov. All rights reserved.
+  This file is part of the esp8266 core for Arduino environment.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef SYNCCLIENT_H_
+#define SYNCCLIENT_H_
+
+#include "Client.h"
+class cbuf;
+class AsyncClient;
+
+class SyncClient: public Client {
+  private:
+    AsyncClient *_client;
+    cbuf *_tx_buffer;
+    size_t _tx_buffer_size;
+    cbuf *_rx_buffer;
+
+    size_t _sendBuffer();
+    void _onData(void *data, size_t len);
+    void _onConnect(AsyncClient *c);
+    void _onDisconnect();
+    void _attachCallbacks();
+
+  public:
+    SyncClient(size_t txBufLen = 1460);
+    SyncClient(AsyncClient *client, size_t txBufLen = 1460);
+    virtual ~SyncClient();
+
+    operator bool(){ return connected(); }
+    SyncClient & operator=(const SyncClient &other);
+
+    int connect(IPAddress ip, uint16_t port);
+    int connect(const char *host, uint16_t port);
+    void setTimeout(uint32_t seconds);
+
+    uint8_t status();
+    uint8_t connected();
+    void stop();
+
+    size_t write(uint8_t data);
+    size_t write(const uint8_t *data, size_t len);
+
+    int available();
+    int peek();
+    int read();
+    int read(uint8_t *data, size_t len);
+    void flush();
+};
+
+#endif /* SYNCCLIENT_H_ */
diff --git a/libraries/WebSockets/src/WebSockets.cpp b/libraries/WebSockets/src/WebSockets.cpp
new file mode 100644
index 0000000..7c27315
--- /dev/null
+++ b/libraries/WebSockets/src/WebSockets.cpp
@@ -0,0 +1,599 @@
+/**
+ * @file WebSockets.cpp
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "WebSockets.h"
+
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+extern "C" {
+#ifdef CORE_HAS_LIBB64
+#include <libb64/cencode.h>
+#else
+#include "libb64/cencode_inc.h"
+#endif
+}
+
+#ifdef ESP8266
+#include <Hash.h>
+#else
+
+extern "C" {
+#include "libsha1/libsha1.h"
+}
+
+#endif
+
+/**
+ *
+ * @param client WSclient_t *  ptr to the client struct
+ * @param code uint16_t see RFC
+ * @param reason
+ * @param reasonLen
+ */
+void WebSockets::clientDisconnect(WSclient_t * client, uint16_t code, char * reason, size_t reasonLen) {
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] clientDisconnect code: %u\n", client->num, code);
+    if(client->status == WSC_CONNECTED && code) {
+        if(reason) {
+            sendFrame(client, WSop_close, (uint8_t *) reason, reasonLen);
+        } else {
+            uint8_t buffer[2];
+            buffer[0] = ((code >> 8) & 0xFF);
+            buffer[1] = (code & 0xFF);
+            sendFrame(client, WSop_close, &buffer[0], 2);
+        }
+    }
+    clientDisconnect(client);
+}
+
+/**
+ *
+ * @param client WSclient_t *   ptr to the client struct
+ * @param opcode WSopcode_t
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param mask bool             add dummy mask to the frame (needed for web browser)
+ * @param fin bool              can be used to send data in more then one frame (set fin on the last frame)
+ * @param headerToPayload bool  set true if the payload has reserved 14 Byte at the beginning to dynamically add the Header (payload neet to be in RAM!)
+ * @return true if ok
+ */
+bool WebSockets::sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool mask, bool fin, bool headerToPayload) {
+
+    if(client->tcp && !client->tcp->connected()) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] not Connected!?\n", client->num);
+        return false;
+    }
+
+    if(client->status != WSC_CONNECTED) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] not in WSC_CONNECTED state!?\n", client->num);
+        return false;
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] ------- send massage frame -------\n", client->num);
+    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] fin: %u opCode: %u mask: %u length: %u headerToPayload: %u\n", client->num, fin, opcode, mask, length, headerToPayload);
+
+    if(opcode == WSop_text) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] text: %s\n", client->num, (payload + (headerToPayload ? 14 : 0)));
+    }
+
+    uint8_t maskKey[4] = { 0x00, 0x00, 0x00, 0x00 };
+    uint8_t buffer[WEBSOCKETS_MAX_HEADER_SIZE] = { 0 };
+
+    uint8_t headerSize;
+    uint8_t * headerPtr;
+    uint8_t * payloadPtr = payload;
+    bool useInternBuffer = false;
+    bool ret = true;
+
+    // calculate header Size
+    if(length < 126) {
+        headerSize = 2;
+    } else if(length < 0xFFFF) {
+        headerSize = 4;
+    } else {
+        headerSize = 10;
+    }
+
+    if(mask) {
+        headerSize += 4;
+    }
+
+#ifdef WEBSOCKETS_USE_BIG_MEM
+    // only for ESP since AVR has less HEAP
+    // try to send data in one TCP package (only if some free Heap is there)
+    if(!headerToPayload && ((length > 0) && (length < 1400)) && (ESP.getFreeHeap() > 6000)) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] pack to one TCP package...\n", client->num);
+        uint8_t * dataPtr = (uint8_t *) malloc(length + WEBSOCKETS_MAX_HEADER_SIZE);
+        if(dataPtr) {
+            memcpy((dataPtr + WEBSOCKETS_MAX_HEADER_SIZE), payload, length);
+            headerToPayload = true;
+            useInternBuffer = true;
+            payloadPtr = dataPtr;
+        }
+    }
+#endif
+
+    // set Header Pointer
+    if(headerToPayload) {
+        // calculate offset in payload
+        headerPtr = (payloadPtr + (WEBSOCKETS_MAX_HEADER_SIZE - headerSize));
+    } else {
+        headerPtr = &buffer[0];
+    }
+
+    // create header
+
+    // byte 0
+    *headerPtr = 0x00;
+    if(fin) {
+        *headerPtr |= bit(7);    ///< set Fin
+    }
+    *headerPtr |= opcode;        ///< set opcode
+    headerPtr++;
+
+    // byte 1
+    *headerPtr = 0x00;
+    if(mask) {
+        *headerPtr |= bit(7);    ///< set mask
+    }
+
+    if(length < 126) {
+        *headerPtr |= length;
+        headerPtr++;
+    } else if(length < 0xFFFF) {
+        *headerPtr |= 126;
+        headerPtr++;
+        *headerPtr = ((length >> 8) & 0xFF);
+        headerPtr++;
+        *headerPtr = (length & 0xFF);
+        headerPtr++;
+    } else {
+        // Normally we never get here (to less memory)
+        *headerPtr |= 127;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = ((length >> 24) & 0xFF);
+        headerPtr++;
+        *headerPtr = ((length >> 16) & 0xFF);
+        headerPtr++;
+        *headerPtr = ((length >> 8) & 0xFF);
+        headerPtr++;
+        *headerPtr = (length & 0xFF);
+        headerPtr++;
+    }
+
+    if(mask) {
+        if(useInternBuffer) {
+            // if we use a Intern Buffer we can modify the data
+            // by this fact its possible the do the masking
+            for(uint8_t x = 0; x < sizeof(maskKey); x++) {
+                maskKey[x] = random(0xFF);
+                *headerPtr = maskKey[x];
+                headerPtr++;
+            }
+
+            uint8_t * dataMaskPtr;
+
+            if(headerToPayload) {
+                dataMaskPtr = (payloadPtr + WEBSOCKETS_MAX_HEADER_SIZE);
+            } else {
+                dataMaskPtr = payloadPtr;
+            }
+
+            for(size_t x = 0; x < length; x++) {
+                dataMaskPtr[x] = (dataMaskPtr[x] ^ maskKey[x % 4]);
+            }
+
+        } else {
+            *headerPtr = maskKey[0];
+            headerPtr++;
+            *headerPtr = maskKey[1];
+            headerPtr++;
+            *headerPtr = maskKey[2];
+            headerPtr++;
+            *headerPtr = maskKey[3];
+            headerPtr++;
+        }
+    }
+
+#ifndef NODEBUG_WEBSOCKETS
+    unsigned long start = micros();
+#endif
+
+    if(headerToPayload) {
+        // header has be added to payload
+        // payload is forced to reserved 14 Byte but we may not need all based on the length and mask settings
+        // offset in payload is calculatetd 14 - headerSize
+        if(client->tcp->write(&payloadPtr[(WEBSOCKETS_MAX_HEADER_SIZE - headerSize)], (length + headerSize)) != (length + headerSize)) {
+            ret = false;
+        }
+    } else {
+        // send header
+        if(client->tcp->write(&buffer[0], headerSize) != headerSize) {
+            ret = false;
+        }
+
+        if(payloadPtr && length > 0) {
+            // send payload
+            if(client->tcp->write(&payloadPtr[0], length) != length) {
+                ret = false;
+            }
+        }
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] sending Frame Done (%uus).\n", client->num, (micros() - start));
+
+#ifdef WEBSOCKETS_USE_BIG_MEM
+    if(useInternBuffer && payloadPtr) {
+        free(payloadPtr);
+    }
+#endif
+
+    return ret;
+}
+
+/**
+ * callen when HTTP header is done
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSockets::headerDone(WSclient_t * client) {
+    client->status = WSC_CONNECTED;
+    client->cWsRXsize = 0;
+    DEBUG_WEBSOCKETS("[WS][%d][headerDone] Header Handling Done (%uus).\n", client->num);
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    client->cHttpLine = "";
+    handleWebsocket(client);
+#endif
+}
+
+/**
+ * handle the WebSocket stream
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSockets::handleWebsocket(WSclient_t * client) {
+    if(client->cWsRXsize == 0) {
+        handleWebsocketCb(client);
+    }
+}
+
+/**
+ * wait for
+ * @param client
+ * @param size
+ */
+bool WebSockets::handleWebsocketWaitFor(WSclient_t * client, size_t size) {
+    if(!client->tcp || !client->tcp->connected()) {
+        return false;
+    }
+
+    if(size > WEBSOCKETS_MAX_HEADER_SIZE) {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor] size: %d to big!\n", client->num, size);
+        return false;
+    }
+
+    if(client->cWsRXsize >= size) {
+        return true;
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor] size: %d cWsRXsize: %d\n", client->num, size, client->cWsRXsize);
+    readCb(client, &client->cWsHeader[client->cWsRXsize], (size - client->cWsRXsize), std::bind([](WebSockets * server, size_t size, WSclient_t * client, bool ok) {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor][readCb] size: %d ok: %d\n", client->num, size, ok);
+        if(ok) {
+            client->cWsRXsize = size;
+            server->handleWebsocketCb(client);
+        } else {
+            DEBUG_WEBSOCKETS("[WS][%d][readCb] failed.\n", client->num);
+            client->cWsRXsize = 0;
+            // timeout or error
+            server->clientDisconnect(client, 1002);
+        }
+    }, this, size, std::placeholders::_1, std::placeholders::_2));
+    return false;
+}
+
+void WebSockets::handleWebsocketCb(WSclient_t * client) {
+
+    if(!client->tcp || !client->tcp->connected()) {
+        return;
+    }
+
+    uint8_t * buffer = client->cWsHeader;
+
+    WSMessageHeader_t * header = &client->cWsHeaderDecode;
+    uint8_t * payload = NULL;
+
+    uint8_t headerLen = 2;
+
+    if(!handleWebsocketWaitFor(client, headerLen)) {
+        return;
+    }
+
+    // split first 2 bytes in the data
+    header->fin = ((*buffer >> 7) & 0x01);
+    header->rsv1 = ((*buffer >> 6) & 0x01);
+    header->rsv2 = ((*buffer >> 5) & 0x01);
+    header->rsv3 = ((*buffer >> 4) & 0x01);
+    header->opCode = (WSopcode_t) (*buffer & 0x0F);
+    buffer++;
+
+    header->mask = ((*buffer >> 7) & 0x01);
+    header->payloadLen = (WSopcode_t) (*buffer & 0x7F);
+    buffer++;
+
+    if(header->payloadLen == 126) {
+        headerLen += 2;
+        if(!handleWebsocketWaitFor(client, headerLen)) {
+            return;
+        }
+        header->payloadLen = buffer[0] << 8 | buffer[1];
+        buffer += 2;
+    } else if(header->payloadLen == 127) {
+        headerLen += 8;
+        // read 64bit integer as length
+        if(!handleWebsocketWaitFor(client, headerLen)) {
+            return;
+        }
+
+        if(buffer[0] != 0 || buffer[1] != 0 || buffer[2] != 0 || buffer[3] != 0) {
+            // really to big!
+            header->payloadLen = 0xFFFFFFFF;
+        } else {
+            header->payloadLen = buffer[4] << 24 | buffer[5] << 16 | buffer[6] << 8 | buffer[7];
+        }
+        buffer += 8;
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] ------- read massage frame -------\n", client->num);
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] fin: %u rsv1: %u rsv2: %u rsv3 %u  opCode: %u\n", client->num, header->fin, header->rsv1, header->rsv2, header->rsv3, header->opCode);
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] mask: %u payloadLen: %u\n", client->num, header->mask, header->payloadLen);
+
+    if(header->payloadLen > WEBSOCKETS_MAX_DATA_SIZE) {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] payload to big! (%u)\n", client->num, header->payloadLen);
+        clientDisconnect(client, 1009);
+        return;
+    }
+
+    if(header->mask) {
+        headerLen += 4;
+        if(!handleWebsocketWaitFor(client, headerLen)) {
+            return;
+        }
+        header->maskKey = buffer;
+        buffer += 4;
+    }
+
+    if(header->payloadLen > 0) {
+        // if text data we need one more
+        payload = (uint8_t *) malloc(header->payloadLen + 1);
+
+        if(!payload) {
+            DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] to less memory to handle payload %d!\n", client->num, header->payloadLen);
+            clientDisconnect(client, 1011);
+            return;
+        }
+        readCb(client, payload, header->payloadLen, std::bind(&WebSockets::handleWebsocketPayloadCb, this, std::placeholders::_1, std::placeholders::_2, payload));
+    } else {
+        handleWebsocketPayloadCb(client, true, NULL);
+    }
+}
+
+void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload) {
+
+    WSMessageHeader_t * header = &client->cWsHeaderDecode;
+    if(ok) {
+        if(header->payloadLen > 0) {
+            payload[header->payloadLen] = 0x00;
+
+            if(header->mask) {
+                //decode XOR
+                for(size_t i = 0; i < header->payloadLen; i++) {
+                    payload[i] = (payload[i] ^ header->maskKey[i % 4]);
+                }
+            }
+        }
+
+        switch(header->opCode) {
+            case WSop_text:
+                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] text: %s\n", client->num, payload);
+                // no break here!
+            case WSop_binary:
+                messageReceived(client, header->opCode, payload, header->payloadLen);
+                break;
+            case WSop_ping:
+                // send pong back
+                sendFrame(client, WSop_pong, payload, header->payloadLen);
+                break;
+            case WSop_pong:
+                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get pong  (%s)\n", client->num, payload);
+                break;
+            case WSop_close: {
+                uint16_t reasonCode = 1000;
+                if(header->payloadLen >= 2) {
+                    reasonCode = payload[0] << 8 | payload[1];
+                }
+
+                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get ask for close. Code: %d", client->num, reasonCode);
+                if(header->payloadLen > 2) {
+                    DEBUG_WEBSOCKETS(" (%s)\n", (payload + 2));
+                } else {
+                    DEBUG_WEBSOCKETS("\n");
+                }
+                clientDisconnect(client, 1000);
+            }
+                break;
+            case WSop_continuation:
+                // continuation is not supported
+                clientDisconnect(client, 1003);
+                break;
+            default:
+                clientDisconnect(client, 1002);
+                break;
+        }
+
+        if(payload) {
+            free(payload);
+        }
+
+        // reset input
+        client->cWsRXsize = 0;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        //register callback for next message
+        handleWebsocketWaitFor(client, 2);
+#endif
+
+    } else {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] missing data!\n", client->num);
+        free(payload);
+        clientDisconnect(client, 1002);
+    }
+}
+
+/**
+ * generate the key for Sec-WebSocket-Accept
+ * @param clientKey String
+ * @return String Accept Key
+ */
+String WebSockets::acceptKey(String & clientKey) {
+    uint8_t sha1HashBin[20] = { 0 };
+#ifdef ESP8266
+    sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]);
+#else
+    clientKey += "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    SHA1_CTX ctx;
+    SHA1Init(&ctx);
+    SHA1Update(&ctx, (const unsigned char*)clientKey.c_str(), clientKey.length());
+    SHA1Final(&sha1HashBin[0], &ctx);
+#endif
+
+    String key = base64_encode(sha1HashBin, 20);
+    key.trim();
+
+    return key;
+}
+
+/**
+ * base64_encode
+ * @param data uint8_t *
+ * @param length size_t
+ * @return base64 encoded String
+ */
+String WebSockets::base64_encode(uint8_t * data, size_t length) {
+    size_t size = ((length * 1.6f) + 1);
+    char * buffer = (char *) malloc(size);
+    if(buffer) {
+        base64_encodestate _state;
+        base64_init_encodestate(&_state);
+        int len = base64_encode_block((const char *) &data[0], length, &buffer[0], &_state);
+        len = base64_encode_blockend((buffer + len), &_state);
+
+        String base64 = String(buffer);
+        free(buffer);
+        return base64;
+    }
+    return String("-FAIL-");
+}
+
+/**
+ * read x byte from tcp or get timeout
+ * @param client WSclient_t *
+ * @param out  uint8_t * data buffer
+ * @param n size_t byte count
+ * @return true if ok
+ */
+bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWaitCb cb) {
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    if(!client->tcp || !client->tcp->connected()) {
+        return false;
+    }
+
+    client->tcp->readBytes(out, n, std::bind([](WSclient_t * client, bool ok, WSreadWaitCb cb) {
+        if(cb) {
+            cb(client, ok);
+        }
+    }, client, std::placeholders::_1, cb));
+
+#else
+    unsigned long t = millis();
+    size_t len;
+    DEBUG_WEBSOCKETS("[readCb] n: %d t: %d\n", n, t);
+    while(n > 0) {
+        if(client->tcp == NULL) {
+            DEBUG_WEBSOCKETS("[readCb] tcp is null!\n");
+            if(cb) {
+                cb(client, false);
+            }
+            return false;
+        }
+
+        if(!client->tcp->connected()) {
+            DEBUG_WEBSOCKETS("[readCb] not connected!\n");
+            if(cb) {
+                cb(client, false);
+            }
+            return false;
+        }
+
+        if((millis() - t) > WEBSOCKETS_TCP_TIMEOUT) {
+            DEBUG_WEBSOCKETS("[readCb] receive TIMEOUT! %d\n", (millis() - t));
+            if(cb) {
+                cb(client, false);
+            }
+            return false;
+        }
+
+        if(!client->tcp->available()) {
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+            delay(0);
+#endif
+            continue;
+        }
+
+        len = client->tcp->read((uint8_t*) out, n);
+        if(len) {
+            t = millis();
+            out += len;
+            n -= len;
+            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
+        } else {
+            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+    if(cb) {
+        cb(client, true);
+    }
+#endif
+    return true;
+}
+
diff --git a/libraries/WebSockets/src/WebSockets.h b/libraries/WebSockets/src/WebSockets.h
new file mode 100644
index 0000000..29225ad
--- /dev/null
+++ b/libraries/WebSockets/src/WebSockets.h
@@ -0,0 +1,229 @@
+/**
+ * @file WebSockets.h
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef WEBSOCKETS_H_
+#define WEBSOCKETS_H_
+
+#include <Arduino.h>
+
+//#define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ )
+
+#ifndef DEBUG_WEBSOCKETS
+#define DEBUG_WEBSOCKETS(...)
+#define NODEBUG_WEBSOCKETS
+#endif
+
+#ifdef ESP8266
+#define WEBSOCKETS_MAX_DATA_SIZE  (15*1024)
+#define WEBSOCKETS_USE_BIG_MEM
+#else
+//atmega328p has only 2KB ram!
+#define WEBSOCKETS_MAX_DATA_SIZE  (1024)
+#endif
+
+#define WEBSOCKETS_TCP_TIMEOUT    (2000)
+
+#define NETWORK_ESP8266_ASYNC   (0)
+#define NETWORK_ESP8266         (1)
+#define NETWORK_W5100           (2)
+#define NETWORK_ENC28J60        (3)
+
+// max size of the WS Message Header
+#define WEBSOCKETS_MAX_HEADER_SIZE  (14)
+
+// select Network type based
+#if defined(ESP8266) || defined(ESP31B)
+#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
+//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
+#else
+#define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
+#endif
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+
+// Note:
+//   No SSL/WSS support for client in Async mode
+//   TLS lib need a sync interface!
+
+#if !defined(ESP8266) && !defined(ESP31B)
+#error "network type ESP8266 ASYNC only possible on the ESP mcu!"
+#endif
+
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#else
+#include <ESP31BWiFi.h>
+#endif
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncTCPbuffer.h>
+#define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer
+#define WEBSOCKETS_NETWORK_SERVER_CLASS AsyncServer
+
+#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+
+#if !defined(ESP8266) && !defined(ESP31B)
+#error "network type ESP8266 only possible on the ESP mcu!"
+#endif
+
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#else
+#include <ESP31BWiFi.h>
+#endif
+#define WEBSOCKETS_NETWORK_CLASS WiFiClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
+
+#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100)
+
+#include <Ethernet.h>
+#include <SPI.h>
+#define WEBSOCKETS_NETWORK_CLASS EthernetClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS EthernetServer
+
+#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60)
+
+#include <UIPEthernet.h>
+#define WEBSOCKETS_NETWORK_CLASS UIPClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS UIPServer
+
+#else
+#error "no network type selected!"
+#endif
+
+
+typedef enum {
+    WSC_NOT_CONNECTED,
+    WSC_HEADER,
+    WSC_CONNECTED
+} WSclientsStatus_t;
+
+typedef enum {
+    WStype_ERROR,
+    WStype_DISCONNECTED,
+    WStype_CONNECTED,
+    WStype_TEXT,
+    WStype_BIN
+} WStype_t;
+
+typedef enum {
+    WSop_continuation = 0x00, ///< %x0 denotes a continuation frame
+    WSop_text = 0x01,         ///< %x1 denotes a text frame
+    WSop_binary = 0x02,       ///< %x2 denotes a binary frame
+                              ///< %x3-7 are reserved for further non-control frames
+    WSop_close = 0x08,        ///< %x8 denotes a connection close
+    WSop_ping = 0x09,         ///< %x9 denotes a ping
+    WSop_pong = 0x0A          ///< %xA denotes a pong
+                              ///< %xB-F are reserved for further control frames
+} WSopcode_t;
+
+typedef struct {
+
+        bool fin;
+        bool rsv1;
+        bool rsv2;
+        bool rsv3;
+
+        WSopcode_t opCode;
+        bool mask;
+
+        size_t payloadLen;
+
+        uint8_t * maskKey;
+} WSMessageHeader_t;
+
+typedef struct {
+        uint8_t num; ///< connection number
+
+        WSclientsStatus_t status;
+
+        WEBSOCKETS_NETWORK_CLASS * tcp;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        bool isSSL;             ///< run in ssl mode
+        WiFiClientSecure * ssl;
+#endif
+
+        String cUrl;        ///< http url
+        uint16_t cCode;     ///< http code
+
+        bool cIsUpgrade;    ///< Connection == Upgrade
+        bool cIsWebsocket;  ///< Upgrade == websocket
+
+        String cKey;        ///< client Sec-WebSocket-Key
+        String cAccept;     ///< client Sec-WebSocket-Accept
+        String cProtocol;   ///< client Sec-WebSocket-Protocol
+        String cExtensions; ///< client Sec-WebSocket-Extensions
+        uint16_t cVersion;  ///< client Sec-WebSocket-Version
+
+        uint8_t cWsRXsize;  ///< State of the RX
+        uint8_t cWsHeader[WEBSOCKETS_MAX_HEADER_SIZE]; ///< RX WS Message buffer
+        WSMessageHeader_t cWsHeaderDecode;
+
+        String base64Authorization; ///< Base64 encoded Auth request
+        String plainAuthorization; ///< Base64 encoded Auth request
+
+        bool cHttpHeadersValid; ///< non-websocket http header validity indicator
+        size_t cMandatoryHeadersCount; ///< non-websocket mandatory http headers present count
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        String cHttpLine;   ///< HTTP header lines
+#endif
+
+} WSclient_t;
+
+
+
+class WebSockets {
+    protected:
+#ifdef __AVR__
+        typedef void (*WSreadWaitCb)(WSclient_t * client, bool ok);
+#else
+        typedef std::function<void(WSclient_t * client, bool ok)> WSreadWaitCb;
+#endif
+
+        virtual void clientDisconnect(WSclient_t * client);
+        virtual bool clientIsConnected(WSclient_t * client);
+
+        virtual void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length);
+
+        void clientDisconnect(WSclient_t * client, uint16_t code, char * reason = NULL, size_t reasonLen = 0);
+        bool sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * payload = NULL, size_t length = 0, bool mask = false, bool fin = true, bool headerToPayload = false);
+
+        void headerDone(WSclient_t * client);
+
+        void handleWebsocket(WSclient_t * client);
+
+        bool handleWebsocketWaitFor(WSclient_t * client, size_t size);
+        void handleWebsocketCb(WSclient_t * client);
+        void handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload);
+
+        String acceptKey(String & clientKey);
+        String base64_encode(uint8_t * data, size_t length);
+
+        bool readCb(WSclient_t * client, uint8_t *out, size_t n, WSreadWaitCb cb);
+
+
+};
+
+#endif /* WEBSOCKETS_H_ */
diff --git a/libraries/WebSockets/src/WebSocketsClient.cpp b/libraries/WebSockets/src/WebSocketsClient.cpp
new file mode 100644
index 0000000..9850052
--- /dev/null
+++ b/libraries/WebSockets/src/WebSocketsClient.cpp
@@ -0,0 +1,629 @@
+/**
+ * @file WebSocketsClient.cpp
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "WebSockets.h"
+#include "WebSocketsClient.h"
+
+
+WebSocketsClient::WebSocketsClient() {
+    _cbEvent = NULL;
+    _client.num = 0;
+}
+
+WebSocketsClient::~WebSocketsClient() {
+    disconnect();
+}
+
+/**
+ * calles to init the Websockets server
+ */
+void WebSocketsClient::begin(const char *host, uint16_t port, const char * url, const char * protocol) {
+    _host = host;
+    _port = port;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _fingerprint = "";
+#endif
+
+    _client.num = 0;
+    _client.status = WSC_NOT_CONNECTED;
+    _client.tcp = NULL;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _client.isSSL = false;
+    _client.ssl = NULL;
+#endif
+    _client.cUrl = url;
+    _client.cCode = 0;
+    _client.cIsUpgrade = false;
+    _client.cIsWebsocket = true;
+    _client.cKey = "";
+    _client.cAccept = "";
+    _client.cProtocol = protocol;
+    _client.cExtensions = "";
+    _client.cVersion = 0;
+    _client.base64Authorization = "";
+    _client.plainAuthorization = "";
+
+#ifdef ESP8266
+    randomSeed(RANDOM_REG32);
+#else
+    // todo find better seed
+    randomSeed(millis());
+#endif
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    asyncConnect();
+#endif
+}
+
+void WebSocketsClient::begin(String host, uint16_t port, String url, String protocol) {
+    begin(host.c_str(), port, url.c_str(), protocol.c_str());
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+void WebSocketsClient::beginSSL(const char *host, uint16_t port, const char * url, const char * fingerprint, const char * protocol) {
+    begin(host, port, url, protocol);
+    _client.isSSL = true;
+    _fingerprint = fingerprint;
+}
+
+void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint, String protocol) {
+    beginSSL(host.c_str(), port, url.c_str(), fingerprint.c_str(), protocol.c_str());
+}
+#endif
+
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * called in arduino loop
+ */
+void WebSocketsClient::loop(void) {
+    if(!clientIsConnected(&_client)) {
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        if(_client.isSSL) {
+            DEBUG_WEBSOCKETS("[WS-Client] connect wss...\n");
+            if(_client.ssl) {
+                delete _client.ssl;
+                _client.ssl = NULL;
+                _client.tcp = NULL;
+            }
+            _client.ssl = new WiFiClientSecure();
+            _client.tcp = _client.ssl;
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client] connect ws...\n");
+            if(_client.tcp) {
+                delete _client.tcp;
+                _client.tcp = NULL;
+            }
+            _client.tcp = new WiFiClient();
+        }
+#else
+        _client.tcp = new WEBSOCKETS_NETWORK_CLASS();
+#endif
+
+        if(!_client.tcp) {
+            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
+            return;
+        }
+
+        if(_client.tcp->connect(_host.c_str(), _port)) {
+            connectedCb();
+        } else {
+            connectFailedCb();
+            delay(10); //some little delay to not flood the server
+        }
+    } else {
+        handleClientData();
+    }
+}
+#endif
+
+/**
+ * set callback function
+ * @param cbEvent WebSocketServerEvent
+ */
+void WebSocketsClient::onEvent(WebSocketClientEvent cbEvent) {
+    _cbEvent = cbEvent;
+}
+
+/**
+ * send text data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsClient::sendTXT(uint8_t * payload, size_t length, bool headerToPayload) {
+    if(length == 0) {
+        length = strlen((const char *) payload);
+    }
+    if(clientIsConnected(&_client)) {
+        return sendFrame(&_client, WSop_text, payload, length, true, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsClient::sendTXT(const uint8_t * payload, size_t length) {
+    return sendTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsClient::sendTXT(char * payload, size_t length, bool headerToPayload) {
+    return sendTXT((uint8_t *) payload, length, headerToPayload);
+}
+
+bool WebSocketsClient::sendTXT(const char * payload, size_t length) {
+    return sendTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsClient::sendTXT(String & payload) {
+    return sendTXT((uint8_t *) payload.c_str(), payload.length());
+}
+
+/**
+ * send binary data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsClient::sendBIN(uint8_t * payload, size_t length, bool headerToPayload) {
+    if(clientIsConnected(&_client)) {
+        return sendFrame(&_client, WSop_binary, payload, length, true, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsClient::sendBIN(const uint8_t * payload, size_t length) {
+    return sendBIN((uint8_t *) payload, length);
+}
+
+/**
+ * disconnect one client
+ * @param num uint8_t client id
+ */
+void WebSocketsClient::disconnect(void) {
+    if(clientIsConnected(&_client)) {
+        WebSockets::clientDisconnect(&_client, 1000);
+    }
+}
+
+/**
+ * set the Authorizatio for the http request
+ * @param user const char *
+ * @param password const char *
+ */
+void WebSocketsClient::setAuthorization(const char * user, const char * password) {
+    if(user && password) {
+        String auth = user;
+        auth += ":";
+        auth += password;
+        _client.base64Authorization = base64_encode((uint8_t *)auth.c_str(), auth.length());
+    }
+}
+
+/**
+ * set the Authorizatio for the http request
+ * @param auth const char * base64
+ */
+void WebSocketsClient::setAuthorization(const char * auth) {
+    if(auth) {
+        //_client.base64Authorization = auth;
+        _client.plainAuthorization = auth;
+    }
+}
+
+//#################################################################################
+//#################################################################################
+//#################################################################################
+
+/**
+ *
+ * @param client WSclient_t *  ptr to the client struct
+ * @param opcode WSopcode_t
+ * @param payload  uint8_t *
+ * @param lenght size_t
+ */
+void WebSocketsClient::messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t lenght) {
+    WStype_t type = WStype_ERROR;
+
+    switch(opcode) {
+        case WSop_text:
+            type = WStype_TEXT;
+            break;
+        case WSop_binary:
+            type = WStype_BIN;
+            break;
+    }
+
+    runCbEvent(type, payload, lenght);
+
+}
+
+/**
+ * Disconnect an client
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsClient::clientDisconnect(WSclient_t * client) {
+
+    bool event = false;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    if(client->isSSL && client->ssl) {
+        if(client->ssl->connected()) {
+            client->ssl->flush();
+            client->ssl->stop();
+        }
+        event = true;
+        delete client->ssl;
+        client->ssl = NULL;
+        client->tcp = NULL;
+    }
+#endif
+
+    if(client->tcp) {
+        if(client->tcp->connected()) {
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+            client->tcp->flush();
+#endif
+            client->tcp->stop();
+        }
+        event = true;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->status = WSC_NOT_CONNECTED;
+#else
+        delete client->tcp;
+#endif
+        client->tcp = NULL;
+    }
+
+    client->cCode = 0;
+    client->cKey = "";
+    client->cAccept = "";
+    client->cProtocol = "";
+    client->cVersion = 0;
+    client->cIsUpgrade = false;
+    client->cIsWebsocket = false;
+
+    client->status = WSC_NOT_CONNECTED;
+
+    DEBUG_WEBSOCKETS("[WS-Client] client disconnected.\n");
+    if(event) {
+        runCbEvent(WStype_DISCONNECTED, NULL, 0);
+    }
+}
+
+/**
+ * get client state
+ * @param client WSclient_t *  ptr to the client struct
+ * @return true = conneted
+ */
+bool WebSocketsClient::clientIsConnected(WSclient_t * client) {
+
+    if(!client->tcp) {
+        return false;
+    }
+
+    if(client->tcp->connected()) {
+        if(client->status != WSC_NOT_CONNECTED) {
+            return true;
+        }
+    } else {
+        // client lost
+        if(client->status != WSC_NOT_CONNECTED) {
+            DEBUG_WEBSOCKETS("[WS-Client] connection lost.\n");
+            // do cleanup
+            clientDisconnect(client);
+        }
+    }
+
+    if(client->tcp) {
+        // do cleanup
+        clientDisconnect(client);
+    }
+
+    return false;
+}
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * Handel incomming data from Client
+ */
+void WebSocketsClient::handleClientData(void) {
+    int len = _client.tcp->available();
+    if(len > 0) {
+        switch(_client.status) {
+            case WSC_HEADER:
+            {
+                String headerLine = _client.tcp->readStringUntil('\n');
+                handleHeader(&_client, &headerLine);
+            }
+                break;
+            case WSC_CONNECTED:
+                WebSockets::handleWebsocket(&_client);
+                break;
+            default:
+                WebSockets::clientDisconnect(&_client, 1002);
+                break;
+        }
+    }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    delay(0);
+#endif
+}
+#endif
+
+/**
+ * send the WebSocket header to Server
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsClient::sendHeader(WSclient_t * client) {
+
+    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header...\n");
+
+    uint8_t randomKey[16] = { 0 };
+
+    for(uint8_t i = 0; i < sizeof(randomKey); i++) {
+        randomKey[i] = random(0xFF);
+    }
+
+    client->cKey = base64_encode(&randomKey[0], 16);
+
+#ifndef NODEBUG_WEBSOCKETS
+    unsigned long start = micros();
+#endif
+
+    String handshake =  "GET " + client->cUrl + " HTTP/1.1\r\n"
+                        "Host: " + _host + ":" + _port + "\r\n"
+                        "Connection: Upgrade\r\n"
+                        "Upgrade: websocket\r\n"
+                        "Origin: file://\r\n"
+                        "User-Agent: arduino-WebSocket-Client\r\n"
+                        "Sec-WebSocket-Version: 13\r\n"
+                        "Sec-WebSocket-Key: " + client->cKey + "\r\n";
+
+    if(client->cProtocol.length() > 0) {
+       handshake += "Sec-WebSocket-Protocol: " + client->cProtocol + "\r\n";
+    }
+
+    if(client->cExtensions.length() > 0) {
+        handshake += "Sec-WebSocket-Extensions: " + client->cExtensions + "\r\n";
+    }
+
+    if(client->base64Authorization.length() > 0) {
+        handshake += "Authorization: Basic " + client->base64Authorization + "\r\n";
+    }
+
+    if(client->plainAuthorization.length() > 0) {
+        handshake += "Authorization: " + client->plainAuthorization + "\r\n";
+    }
+
+    handshake += "\r\n";
+
+    client->tcp->write(handshake.c_str(), handshake.length());
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+
+    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header... Done (%uus).\n", (micros() - start));
+
+}
+
+/**
+ * handle the WebSocket header reading
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
+
+    headerLine->trim(); // remove \r
+
+    if(headerLine->length() > 0) {
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] RX: %s\n", headerLine->c_str());
+
+        if(headerLine->startsWith("HTTP/1.")) {
+            // "HTTP/1.1 101 Switching Protocols"
+            client->cCode = headerLine->substring(9, headerLine->indexOf(' ', 9)).toInt();
+        } else if(headerLine->indexOf(':')) {
+            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
+            String headerValue = headerLine->substring(headerLine->indexOf(':') + 2);
+
+            if(headerName.equalsIgnoreCase("Connection")) {
+                if(headerValue.equalsIgnoreCase("upgrade")) {
+                    client->cIsUpgrade = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Upgrade")) {
+                if(headerValue.equalsIgnoreCase("websocket")) {
+                    client->cIsWebsocket = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Accept")) {
+                client->cAccept = headerValue;
+                client->cAccept.trim(); // see rfc6455
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Protocol")) {
+                client->cProtocol = headerValue;
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Extensions")) {
+                client->cExtensions = headerValue;
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Version")) {
+                client->cVersion = headerValue.toInt();
+            }
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
+        }
+
+        (*headerLine) = "";
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+
+    } else {
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header read fin.\n");
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Client settings:\n");
+
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cURL: %s\n", client->cUrl.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cKey: %s\n", client->cKey.c_str());
+
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Server header:\n");
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cCode: %d\n", client->cCode);
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cIsUpgrade: %d\n", client->cIsUpgrade);
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cIsWebsocket: %d\n", client->cIsWebsocket);
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cAccept: %s\n", client->cAccept.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cProtocol: %s\n", client->cProtocol.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cExtensions: %s\n", client->cExtensions.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cVersion: %d\n", client->cVersion);
+
+        bool ok = (client->cIsUpgrade && client->cIsWebsocket);
+
+        if(ok) {
+            switch(client->cCode) {
+                case 101:  ///< Switching Protocols
+
+                    break;
+                case 403: ///< Forbidden
+                    // todo handle login
+                default:   ///< Server dont unterstand requrst
+                    ok = false;
+                    DEBUG_WEBSOCKETS("[WS-Client][handleHeader] serverCode is not 101 (%d)\n", client->cCode);
+                    clientDisconnect(client);
+                    break;
+            }
+        }
+
+        if(ok) {
+
+            if(client->cAccept.length() == 0) {
+                ok = false;
+            } else {
+                // generate Sec-WebSocket-Accept key for check
+                String sKey = acceptKey(client->cKey);
+                if(sKey != client->cAccept) {
+                    DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Sec-WebSocket-Accept is wrong\n");
+                    ok = false;
+                }
+            }
+        }
+
+        if(ok) {
+
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Websocket connection init done.\n");
+            headerDone(client);
+
+
+            runCbEvent(WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
+
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] no Websocket connection close.\n");
+            client->tcp->write("This is a webSocket client!");
+            clientDisconnect(client);
+        }
+    }
+}
+
+void WebSocketsClient::connectedCb() {
+
+    DEBUG_WEBSOCKETS("[WS-Client] connected to %s:%u.\n", _host.c_str(), _port);
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    _client.tcp->onDisconnect(std::bind([](WebSocketsClient * c, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
+        DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
+        client->status = WSC_NOT_CONNECTED;
+        client->tcp = NULL;
+
+        // reconnect
+        c->asyncConnect();
+
+        return true;
+    }, this, std::placeholders::_1, &_client));
+#endif
+
+    _client.status = WSC_HEADER;
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+    // set Timeout for readBytesUntil and readStringUntil
+    _client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
+#endif
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _client.tcp->setNoDelay(true);
+
+    if(_client.isSSL && _fingerprint.length()) {
+        if(!_client.ssl->verify(_fingerprint.c_str(), _host.c_str())) {
+            DEBUG_WEBSOCKETS("[WS-Client] certificate mismatch\n");
+            WebSockets::clientDisconnect(&_client, 1000);
+            return;
+        }
+    }
+#endif
+
+    // send Header to Server
+    sendHeader(&_client);
+
+}
+
+
+void WebSocketsClient::connectFailedCb() {
+    DEBUG_WEBSOCKETS("[WS-Client] connection to %s:%u Faild\n", _host.c_str(), _port);
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+
+void WebSocketsClient::asyncConnect() {
+
+    DEBUG_WEBSOCKETS("[WS-Client] asyncConnect...\n");
+
+    AsyncClient * tcpclient = new AsyncClient();
+
+    if(!tcpclient) {
+        DEBUG_WEBSOCKETS("[WS-Client] creating AsyncClient class failed!\n");
+        return;
+    }
+
+    tcpclient->onDisconnect([](void *obj, AsyncClient* c) {
+        c->free();
+        delete c;
+    });
+
+    tcpclient->onConnect(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
+        ws->_client.tcp = new AsyncTCPbuffer(tcp);
+        if(!ws->_client.tcp) {
+            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!\n");
+            ws->connectFailedCb();
+            return;
+        }
+        ws->connectedCb();
+    }, this, std::placeholders::_2));
+
+    tcpclient->onError(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
+        ws->connectFailedCb();
+
+        // reconnect
+        ws->asyncConnect();
+    }, this, std::placeholders::_2));
+
+    if(!tcpclient->connect(_host.c_str(), _port)) {
+        connectFailedCb();
+        delete tcpclient;
+    }
+
+}
+
+#endif
diff --git a/libraries/WebSockets/src/WebSocketsClient.h b/libraries/WebSockets/src/WebSocketsClient.h
new file mode 100644
index 0000000..722602f
--- /dev/null
+++ b/libraries/WebSockets/src/WebSocketsClient.h
@@ -0,0 +1,118 @@
+/**
+ * @file WebSocketsClient.h
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef WEBSOCKETSCLIENT_H_
+#define WEBSOCKETSCLIENT_H_
+
+#include <Arduino.h>
+#include "WebSockets.h"
+
+class WebSocketsClient: private WebSockets {
+    public:
+#ifdef __AVR__
+        typedef void (*WebSocketClientEvent)(WStype_t type, uint8_t * payload, size_t length);
+#else
+        typedef std::function<void (WStype_t type, uint8_t * payload, size_t length)> WebSocketClientEvent;
+#endif
+
+
+        WebSocketsClient(void);
+        ~WebSocketsClient(void);
+
+        void begin(const char *host, uint16_t port, const char * url = "/", const char * protocol = "arduino");
+        void begin(String host, uint16_t port, String url = "/", String protocol = "arduino");
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        void beginSSL(const char *host, uint16_t port, const char * url = "/", const char * = "", const char * protocol = "arduino");
+        void beginSSL(String host, uint16_t port, String url = "/", String fingerprint = "", String protocol = "arduino");
+#endif
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void loop(void);
+#else
+        // Async interface not need a loop call
+        void loop(void) __attribute__ ((deprecated)) {}
+#endif
+
+        void onEvent(WebSocketClientEvent cbEvent);
+
+        bool sendTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(const uint8_t * payload, size_t length = 0);
+        bool sendTXT(char * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(const char * payload, size_t length = 0);
+        bool sendTXT(String & payload);
+
+        bool sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
+        bool sendBIN(const uint8_t * payload, size_t length);
+
+        void disconnect(void);
+
+        void setAuthorization(const char * user, const char * password);
+        void setAuthorization(const char * auth);
+
+    protected:
+        String _host;
+        uint16_t _port;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        String _fingerprint;
+#endif
+        WSclient_t _client;
+
+        WebSocketClientEvent _cbEvent;
+
+        void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length);
+
+        void clientDisconnect(WSclient_t * client);
+        bool clientIsConnected(WSclient_t * client);
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void handleClientData(void);
+#endif
+
+        void sendHeader(WSclient_t * client);
+        void handleHeader(WSclient_t * client, String * headerLine);
+
+        void connectedCb();
+        void connectFailedCb();
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        void asyncConnect();
+#endif
+
+        /**
+         * called for sending a Event to the app
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
+        virtual void runCbEvent(WStype_t type, uint8_t * payload, size_t length) {
+            if(_cbEvent) {
+                _cbEvent(type, payload, length);
+            }
+        }
+
+};
+
+#endif /* WEBSOCKETSCLIENT_H_ */
diff --git a/libraries/WebSockets/src/WebSocketsServer.cpp b/libraries/WebSockets/src/WebSocketsServer.cpp
new file mode 100644
index 0000000..2c3e072
--- /dev/null
+++ b/libraries/WebSockets/src/WebSocketsServer.cpp
@@ -0,0 +1,777 @@
+/**
+ * @file WebSocketsServer.cpp
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "WebSockets.h"
+#include "WebSocketsServer.h"
+
+WebSocketsServer::WebSocketsServer(uint16_t port, String origin, String protocol) {
+    _port = port;
+    _origin = origin;
+    _protocol = protocol;
+
+    _server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port);
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    _server->onClient([](void *s, AsyncClient* c){
+        ((WebSocketsServer*)s)->newClient(new AsyncTCPbuffer(c));
+    }, this);
+#endif
+
+    _cbEvent = NULL;
+
+    _httpHeaderValidationFunc = NULL;
+    _mandatoryHttpHeaders = NULL;
+    _mandatoryHttpHeaderCount = 0;
+}
+
+
+WebSocketsServer::~WebSocketsServer() {
+    // disconnect all clients
+    disconnect();
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _server->close();
+#else
+    // TODO how to close server?
+#endif
+
+    if (_mandatoryHttpHeaders)
+        delete[] _mandatoryHttpHeaders;
+
+    _mandatoryHttpHeaderCount = 0;
+}
+
+/**
+ * called to initialize the Websocket server
+ */
+void WebSocketsServer::begin(void) {
+    WSclient_t * client;
+
+    // init client storage
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+
+        client->num = i;
+        client->status = WSC_NOT_CONNECTED;
+        client->tcp = NULL;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        client->isSSL = false;
+        client->ssl = NULL;
+#endif
+        client->cUrl = "";
+        client->cCode = 0;
+        client->cKey = "";
+        client->cProtocol = "";
+        client->cVersion = 0;
+        client->cIsUpgrade = false;
+        client->cIsWebsocket = false;
+
+        client->base64Authorization = "";
+
+        client->cWsRXsize = 0;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->cHttpLine = "";
+#endif
+    }
+
+#ifdef ESP8266
+    randomSeed(RANDOM_REG32);
+#else
+    // TODO find better seed
+    randomSeed(millis());
+#endif
+
+    _server->begin();
+
+    DEBUG_WEBSOCKETS("[WS-Server] Server Started.\n");
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * called in arduino loop
+ */
+void WebSocketsServer::loop(void) {
+    handleNewClients();
+    handleClientData();
+}
+#endif
+
+/**
+ * set callback function
+ * @param cbEvent WebSocketServerEvent
+ */
+void WebSocketsServer::onEvent(WebSocketServerEvent cbEvent) {
+    _cbEvent = cbEvent;
+}
+
+/*
+ * Sets the custom http header validator function
+ * @param httpHeaderValidationFunc WebSocketServerHttpHeaderValFunc ///< pointer to the custom http header validation function
+ * @param mandatoryHttpHeaders[] const char* ///< the array of named http headers considered to be mandatory / must be present in order for websocket upgrade to succeed
+ * @param mandatoryHttpHeaderCount size_t ///< the number of items in the mandatoryHttpHeaders array
+ */
+void WebSocketsServer::onValidateHttpHeader(
+	WebSocketServerHttpHeaderValFunc validationFunc,
+	const char* mandatoryHttpHeaders[],
+	size_t mandatoryHttpHeaderCount)
+{
+	_httpHeaderValidationFunc = validationFunc;
+
+	if (_mandatoryHttpHeaders)
+		delete[] _mandatoryHttpHeaders;
+
+	_mandatoryHttpHeaderCount = mandatoryHttpHeaderCount;
+	_mandatoryHttpHeaders = new String[_mandatoryHttpHeaderCount];
+
+	for (size_t i = 0; i < _mandatoryHttpHeaderCount; i++) {
+		_mandatoryHttpHeaders[i] = mandatoryHttpHeaders[i];
+	}
+}
+
+/*
+ * send text data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::sendTXT(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload) {
+    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
+        return false;
+    }
+    if(length == 0) {
+        length = strlen((const char *) payload);
+    }
+    WSclient_t * client = &_clients[num];
+    if(clientIsConnected(client)) {
+        return sendFrame(client, WSop_text, payload, length, false, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, const uint8_t * payload, size_t length) {
+    return sendTXT(num, (uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, char * payload, size_t length, bool headerToPayload) {
+    return sendTXT(num, (uint8_t *) payload, length, headerToPayload);
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, const char * payload, size_t length) {
+    return sendTXT(num, (uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, String & payload) {
+    return sendTXT(num, (uint8_t *) payload.c_str(), payload.length());
+}
+
+/**
+ * send text data to client all
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::broadcastTXT(uint8_t * payload, size_t length, bool headerToPayload) {
+    WSclient_t * client;
+    bool ret = true;
+    if(length == 0) {
+        length = strlen((const char *) payload);
+    }
+
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            if(!sendFrame(client, WSop_text, payload, length, false, true, headerToPayload)) {
+                ret = false;
+            }
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+    return ret;
+}
+
+bool WebSocketsServer::broadcastTXT(const uint8_t * payload, size_t length) {
+    return broadcastTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::broadcastTXT(char * payload, size_t length, bool headerToPayload) {
+    return broadcastTXT((uint8_t *) payload, length, headerToPayload);
+}
+
+bool WebSocketsServer::broadcastTXT(const char * payload, size_t length) {
+    return broadcastTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::broadcastTXT(String & payload) {
+    return broadcastTXT((uint8_t *) payload.c_str(), payload.length());
+}
+
+/**
+ * send binary data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload) {
+    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
+        return false;
+    }
+    WSclient_t * client = &_clients[num];
+    if(clientIsConnected(client)) {
+        return sendFrame(client, WSop_binary, payload, length, false, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsServer::sendBIN(uint8_t num, const uint8_t * payload, size_t length) {
+    return sendBIN(num, (uint8_t *) payload, length);
+}
+
+/**
+ * send binary data to client all
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload) {
+    WSclient_t * client;
+    bool ret = true;
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            if(!sendFrame(client, WSop_binary, payload, length, false, true, headerToPayload)) {
+                ret = false;
+            }
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+    return ret;
+}
+
+bool WebSocketsServer::broadcastBIN(const uint8_t * payload, size_t length) {
+    return broadcastBIN((uint8_t *) payload, length);
+}
+
+/**
+ * disconnect all clients
+ */
+void WebSocketsServer::disconnect(void) {
+    WSclient_t * client;
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            WebSockets::clientDisconnect(client, 1000);
+        }
+    }
+}
+
+/**
+ * disconnect one client
+ * @param num uint8_t client id
+ */
+void WebSocketsServer::disconnect(uint8_t num) {
+    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
+        return;
+    }
+    WSclient_t * client = &_clients[num];
+    if(clientIsConnected(client)) {
+        WebSockets::clientDisconnect(client, 1000);
+    }
+}
+
+
+/*
+ * set the Authorization for the http request
+ * @param user const char *
+ * @param password const char *
+ */
+void WebSocketsServer::setAuthorization(const char * user, const char * password) {
+    if(user && password) {
+        String auth = user;
+        auth += ":";
+        auth += password;
+        _base64Authorization = base64_encode((uint8_t *)auth.c_str(), auth.length());
+    }
+}
+
+/**
+ * set the Authorizatio for the http request
+ * @param auth const char * base64
+ */
+void WebSocketsServer::setAuthorization(const char * auth) {
+    if(auth) {
+        _base64Authorization = auth;
+    }
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+/**
+ * get an IP for a client
+ * @param num uint8_t client id
+ * @return IPAddress
+ */
+IPAddress WebSocketsServer::remoteIP(uint8_t num) {
+    if(num < WEBSOCKETS_SERVER_CLIENT_MAX) {
+        WSclient_t * client = &_clients[num];
+        if(clientIsConnected(client)) {
+            return client->tcp->remoteIP();
+        }
+    }
+
+    return IPAddress();
+}
+#endif
+
+//#################################################################################
+//#################################################################################
+//#################################################################################
+
+/**
+ * handle new client connection
+ * @param client
+ */
+bool WebSocketsServer::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient) {
+    WSclient_t * client;
+    // search free list entry for client
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+
+        // state is not connected or tcp connection is lost
+        if(!clientIsConnected(client)) {
+
+            client->tcp = TCPclient;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+            client->isSSL = false;
+            client->tcp->setNoDelay(true);
+#endif
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+            // set Timeout for readBytesUntil and readStringUntil
+            client->tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
+#endif
+            client->status = WSC_HEADER;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+            IPAddress ip = client->tcp->remoteIP();
+            DEBUG_WEBSOCKETS("[WS-Server][%d] new client from %d.%d.%d.%d\n", client->num, ip[0], ip[1], ip[2], ip[3]);
+#else
+            DEBUG_WEBSOCKETS("[WS-Server][%d] new client\n", client->num);
+#endif
+
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+            client->tcp->onDisconnect(std::bind([](WebSocketsServer * server, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
+                DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
+
+                AsyncTCPbuffer ** sl = &server->_clients[client->num].tcp;
+                if(*sl == obj) {
+                    client->status = WSC_NOT_CONNECTED;
+                    *sl = NULL;
+                }
+                return true;
+            },  this, std::placeholders::_1, client));
+
+
+            client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+
+            return true;
+            break;
+        }
+    }
+    return false;
+}
+
+/**
+ *
+ * @param client WSclient_t *  ptr to the client struct
+ * @param opcode WSopcode_t
+ * @param payload  uint8_t *
+ * @param lenght size_t
+ */
+void WebSocketsServer::messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t lenght) {
+    WStype_t type = WStype_ERROR;
+
+    switch(opcode) {
+        case WSop_text:
+            type = WStype_TEXT;
+            break;
+        case WSop_binary:
+            type = WStype_BIN;
+            break;
+    }
+
+    runCbEvent(client->num, type, payload, lenght);
+
+}
+
+/**
+ * Disconnect an client
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsServer::clientDisconnect(WSclient_t * client) {
+
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    if(client->isSSL && client->ssl) {
+        if(client->ssl->connected()) {
+            client->ssl->flush();
+            client->ssl->stop();
+        }
+        delete client->ssl;
+        client->ssl = NULL;
+        client->tcp = NULL;
+    }
+#endif
+
+    if(client->tcp) {
+        if(client->tcp->connected()) {
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+            client->tcp->flush();
+#endif
+            client->tcp->stop();
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->status = WSC_NOT_CONNECTED;
+#else
+        delete client->tcp;
+#endif
+        client->tcp = NULL;
+    }
+
+    client->cUrl = "";
+    client->cKey = "";
+    client->cProtocol = "";
+    client->cVersion = 0;
+    client->cIsUpgrade = false;
+    client->cIsWebsocket = false;
+
+    client->cWsRXsize = 0;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    client->cHttpLine = "";
+#endif
+
+    client->status = WSC_NOT_CONNECTED;
+
+    DEBUG_WEBSOCKETS("[WS-Server][%d] client disconnected.\n", client->num);
+
+    runCbEvent(client->num, WStype_DISCONNECTED, NULL, 0);
+
+}
+
+/**
+ * get client state
+ * @param client WSclient_t *  ptr to the client struct
+ * @return true = connected
+ */
+bool WebSocketsServer::clientIsConnected(WSclient_t * client) {
+
+    if(!client->tcp) {
+        return false;
+    }
+
+    if(client->tcp->connected()) {
+        if(client->status != WSC_NOT_CONNECTED) {
+            return true;
+        }
+    } else {
+        // client lost
+        if(client->status != WSC_NOT_CONNECTED) {
+            DEBUG_WEBSOCKETS("[WS-Server][%d] client connection lost.\n", client->num);
+            // do cleanup
+            clientDisconnect(client);
+        }
+    }
+
+    if(client->tcp) {
+        // do cleanup
+        DEBUG_WEBSOCKETS("[WS-Server][%d] client list cleanup.\n", client->num);
+        clientDisconnect(client);
+    }
+
+    return false;
+}
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * Handle incoming Connection Request
+ */
+void WebSocketsServer::handleNewClients(void) {
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    while(_server->hasClient()) {
+#endif
+        bool ok = false;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        // store new connection
+        WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
+#else
+        WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
+#endif
+
+        if(!tcpClient) {
+            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
+            return;
+        }
+
+        ok = newClient(tcpClient);
+
+        if(!ok) {
+            // no free space to handle client
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+            IPAddress ip = tcpClient->remoteIP();
+            DEBUG_WEBSOCKETS("[WS-Server] no free space new client from %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
+#else
+            DEBUG_WEBSOCKETS("[WS-Server] no free space new client\n");
+#endif
+            tcpClient->stop();
+        }
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+    }
+#endif
+
+}
+
+
+/**
+ * Handel incomming data from Client
+ */
+void WebSocketsServer::handleClientData(void) {
+
+    WSclient_t * client;
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            int len = client->tcp->available();
+            if(len > 0) {
+                //DEBUG_WEBSOCKETS("[WS-Server][%d][handleClientData] len: %d\n", client->num, len);
+                switch(client->status) {
+                    case WSC_HEADER:
+                    {
+                        String headerLine = client->tcp->readStringUntil('\n');
+                        handleHeader(client, &headerLine);
+                    }
+                        break;
+                    case WSC_CONNECTED:
+                        WebSockets::handleWebsocket(client);
+                        break;
+                    default:
+                        WebSockets::clientDisconnect(client, 1002);
+                        break;
+                }
+            }
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+}
+#endif
+
+/*
+ * returns an indicator whether the given named header exists in the configured _mandatoryHttpHeaders collection
+ * @param headerName String ///< the name of the header being checked
+ */
+bool WebSocketsServer::hasMandatoryHeader(String headerName) {
+	for (size_t i = 0; i < _mandatoryHttpHeaderCount; i++) {
+		if (_mandatoryHttpHeaders[i].equalsIgnoreCase(headerName))
+			return true;
+	}
+	return false;
+}
+
+/**
+ * handles http header reading for WebSocket upgrade
+ * @param client WSclient_t * ///< pointer to the client struct
+ * @param headerLine String ///< the header being read / processed
+ */
+void WebSocketsServer::handleHeader(WSclient_t * client, String * headerLine) {
+
+    headerLine->trim(); // remove \r
+
+    if(headerLine->length() > 0) {
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] RX: %s\n", client->num, headerLine->c_str());
+
+        // websocket requests always start with GET see rfc6455
+        if(headerLine->startsWith("GET ")) {
+
+            // cut URL out
+            client->cUrl = headerLine->substring(4, headerLine->indexOf(' ', 4));
+
+            //reset non-websocket http header validation state for this client
+			client->cHttpHeadersValid = true;
+			client->cMandatoryHeadersCount = 0;
+
+        } else if(headerLine->indexOf(':')) {
+            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
+            String headerValue = headerLine->substring(headerLine->indexOf(':') + 2);
+
+            if(headerName.equalsIgnoreCase("Connection")) {
+                headerValue.toLowerCase();
+            	if(headerValue.indexOf("upgrade") >= 0) {
+                    client->cIsUpgrade = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Upgrade")) {
+                if(headerValue.equalsIgnoreCase("websocket")) {
+                    client->cIsWebsocket = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Version")) {
+                client->cVersion = headerValue.toInt();
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Key")) {
+                client->cKey = headerValue;
+                client->cKey.trim(); // see rfc6455
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Protocol")) {
+                client->cProtocol = headerValue;
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Extensions")) {
+                client->cExtensions = headerValue;
+            } else if(headerName.equalsIgnoreCase("Authorization")) {
+                client->base64Authorization = headerValue;
+            } else {
+            	client->cHttpHeadersValid &= execHttpHeaderValidation(headerName, headerValue);
+            	if (_mandatoryHttpHeaderCount > 0 && hasMandatoryHeader(headerName)) {
+            		client->cMandatoryHeadersCount++;
+            	}
+            }
+
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
+        }
+
+        (*headerLine) = "";
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+    } else {
+
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Header read fin.\n", client->num);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cURL: %s\n", client->num, client->cUrl.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cIsUpgrade: %d\n", client->num, client->cIsUpgrade);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cIsWebsocket: %d\n", client->num, client->cIsWebsocket);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cKey: %s\n", client->num, client->cKey.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cProtocol: %s\n", client->num, client->cProtocol.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cExtensions: %s\n", client->num, client->cExtensions.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cVersion: %d\n", client->num, client->cVersion);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - base64Authorization: %s\n", client->num, client->base64Authorization.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cHttpHeadersValid: %d\n", client->num, client->cHttpHeadersValid);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cMandatoryHeadersCount: %d\n", client->num, client->cMandatoryHeadersCount);
+
+        bool ok = (client->cIsUpgrade && client->cIsWebsocket);
+
+        if(ok) {
+            if(client->cUrl.length() == 0) {
+                ok = false;
+            }
+            if(client->cKey.length() == 0) {
+                ok = false;
+            }
+            if(client->cVersion != 13) {
+                ok = false;
+            }
+            if(!client->cHttpHeadersValid) {
+            	ok = false;
+            }
+            if (client->cMandatoryHeadersCount != _mandatoryHttpHeaderCount) {
+            	ok = false;
+            }
+        }
+
+        if(_base64Authorization.length() > 0) {
+            if(client->base64Authorization.length() > 0) {
+                String auth = "Basic ";
+                auth += _base64Authorization;
+                if(auth != client->base64Authorization) {
+                    DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] HTTP Authorization failed!\n", client->num);
+                    handleAuthorizationFailed(client);
+                    return;
+                }
+            } else {
+                ok = false;
+            }
+        }
+
+        if(ok) {
+
+            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incoming.\n", client->num);
+
+            // generate Sec-WebSocket-Accept key
+            String sKey = acceptKey(client->cKey);
+
+            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - sKey: %s\n", client->num, sKey.c_str());
+
+            client->status = WSC_CONNECTED;
+
+            client->tcp->write("HTTP/1.1 101 Switching Protocols\r\n"
+                    "Server: arduino-WebSocketsServer\r\n"
+                    "Upgrade: websocket\r\n"
+                    "Connection: Upgrade\r\n"
+                    "Sec-WebSocket-Version: 13\r\n"
+                    "Sec-WebSocket-Accept: ");
+            client->tcp->write(sKey.c_str(), sKey.length());
+
+            if(_origin.length() > 0) {
+                String origin = "\r\nAccess-Control-Allow-Origin: ";
+                origin += _origin;
+                origin += "\r\n";
+                client->tcp->write(origin.c_str(), origin.length());
+            }
+
+            if(client->cProtocol.length() > 0) {
+                String protocol = "\r\nSec-WebSocket-Protocol: ";
+                protocol += _protocol;
+                protocol += "\r\n";
+                client->tcp->write(protocol.c_str(), protocol.length());
+            } else {
+                client->tcp->write("\r\n");
+            }
+
+            // header end
+            client->tcp->write("\r\n");
+
+            headerDone(client);
+
+            // send ping
+            WebSockets::sendFrame(client, WSop_ping);
+
+            runCbEvent(client->num, WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
+
+        } else {
+            handleNonWebsocketConnection(client);
+        }
+    }
+}
+
+
+
diff --git a/libraries/WebSockets/src/WebSocketsServer.h b/libraries/WebSockets/src/WebSocketsServer.h
new file mode 100644
index 0000000..4a541ab
--- /dev/null
+++ b/libraries/WebSockets/src/WebSocketsServer.h
@@ -0,0 +1,201 @@
+/**
+ * @file WebSocketsServer.h
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef WEBSOCKETSSERVER_H_
+#define WEBSOCKETSSERVER_H_
+
+#include <Arduino.h>
+#include "WebSockets.h"
+
+#define WEBSOCKETS_SERVER_CLIENT_MAX  (5)
+
+
+
+
+class WebSocketsServer: private WebSockets {
+public:
+
+#ifdef __AVR__
+        typedef void (*WebSocketServerEvent)(uint8_t num, WStype_t type, uint8_t * payload, size_t length);
+        typedef bool (*WebSocketServerHttpHeaderValFunc)(String headerName, String headerValue);
+#else
+        typedef std::function<void (uint8_t num, WStype_t type, uint8_t * payload, size_t length)> WebSocketServerEvent;
+        typedef std::function<bool (String headerName, String headerValue)> WebSocketServerHttpHeaderValFunc;
+#endif
+
+        WebSocketsServer(uint16_t port, String origin = "", String protocol = "arduino");
+        ~WebSocketsServer(void);
+
+        void begin(void);
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void loop(void);
+#else
+        // Async interface not need a loop call
+        void loop(void) __attribute__ ((deprecated)) {}
+#endif
+
+        void onEvent(WebSocketServerEvent cbEvent);
+        void onValidateHttpHeader(
+			WebSocketServerHttpHeaderValFunc validationFunc,
+			const char* mandatoryHttpHeaders[],
+			size_t mandatoryHttpHeaderCount);
+
+
+        bool sendTXT(uint8_t num, uint8_t * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(uint8_t num, const uint8_t * payload, size_t length = 0);
+        bool sendTXT(uint8_t num, char * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(uint8_t num, const char * payload, size_t length = 0);
+        bool sendTXT(uint8_t num, String & payload);
+
+        bool broadcastTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
+        bool broadcastTXT(const uint8_t * payload, size_t length = 0);
+        bool broadcastTXT(char * payload, size_t length = 0, bool headerToPayload = false);
+        bool broadcastTXT(const char * payload, size_t length = 0);
+        bool broadcastTXT(String & payload);
+
+        bool sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false);
+        bool sendBIN(uint8_t num, const uint8_t * payload, size_t length);
+
+        bool broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
+        bool broadcastBIN(const uint8_t * payload, size_t length);
+
+        void disconnect(void);
+        void disconnect(uint8_t num);
+
+        void setAuthorization(const char * user, const char * password);
+        void setAuthorization(const char * auth);
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        IPAddress remoteIP(uint8_t num);
+#endif
+
+protected:
+        uint16_t _port;
+        String _origin;
+        String _protocol;
+        String _base64Authorization; ///< Base64 encoded Auth request
+        String * _mandatoryHttpHeaders;
+        size_t _mandatoryHttpHeaderCount;
+
+        WEBSOCKETS_NETWORK_SERVER_CLASS * _server;
+
+        WSclient_t _clients[WEBSOCKETS_SERVER_CLIENT_MAX];
+
+        WebSocketServerEvent _cbEvent;
+        WebSocketServerHttpHeaderValFunc _httpHeaderValidationFunc;
+
+        bool newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient);
+
+        void messageReceived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length);
+
+        void clientDisconnect(WSclient_t * client);
+        bool clientIsConnected(WSclient_t * client);
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void handleNewClients(void);
+        void handleClientData(void);
+#endif
+
+        void handleHeader(WSclient_t * client, String * headerLine);
+
+        /**
+         * called if a non Websocket connection is coming in.
+         * Note: can be override
+         * @param client WSclient_t *  ptr to the client struct
+         */
+        virtual void handleNonWebsocketConnection(WSclient_t * client) {
+            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] no Websocket connection close.\n", client->num);
+            client->tcp->write("HTTP/1.1 400 Bad Request\r\n"
+                    "Server: arduino-WebSocket-Server\r\n"
+                    "Content-Type: text/plain\r\n"
+                    "Content-Length: 32\r\n"
+                    "Connection: close\r\n"
+                    "Sec-WebSocket-Version: 13\r\n"
+                    "\r\n"
+                    "This is a Websocket server only!");
+            clientDisconnect(client);
+        }
+
+        /**
+         * called if a non Authorization connection is coming in.
+         * Note: can be override
+         * @param client WSclient_t *  ptr to the client struct
+         */
+        virtual void handleAuthorizationFailed(WSclient_t *client) {
+
+            client->tcp->write("HTTP/1.1 401 Unauthorized\r\n"
+                    "Server: arduino-WebSocket-Server\r\n"
+                    "Content-Type: text/plain\r\n"
+                    "Content-Length: 45\r\n"
+                    "Connection: close\r\n"
+                    "Sec-WebSocket-Version: 13\r\n"
+                    "WWW-Authenticate: Basic realm=\"WebSocket Server\""
+                    "\r\n"
+                    "This Websocket server requires Authorization!");
+            clientDisconnect(client);
+        }
+
+        /**
+         * called for sending a Event to the app
+         * @param num uint8_t
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
+        virtual void runCbEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
+            if(_cbEvent) {
+                _cbEvent(num, type, payload, length);
+            }
+        }
+
+        /*
+         * Called at client socket connect handshake negotiation time for each http header that is not
+         * a websocket specific http header (not Connection, Upgrade, Sec-WebSocket-*)
+         * If the custom httpHeaderValidationFunc returns false for any headerName / headerValue passed, the
+         * socket negotiation is considered invalid and the upgrade to websockets request is denied / rejected
+         * This mechanism can be used to enable custom authentication schemes e.g. test the value
+         * of a session cookie to determine if a user is logged on / authenticated
+         */
+        virtual bool execHttpHeaderValidation(String headerName, String headerValue) {
+        	if(_httpHeaderValidationFunc) {
+        		//return the value of the custom http header validation function
+        		return _httpHeaderValidationFunc(headerName, headerValue);
+        	}
+        	//no custom http header validation so just assume all is good
+        	return true;
+        }
+
+private:
+        /*
+         * returns an indicator whether the given named header exists in the configured _mandatoryHttpHeaders collection
+         * @param headerName String ///< the name of the header being checked
+         */
+        bool hasMandatoryHeader(String headerName);
+
+};
+
+
+
+#endif /* WEBSOCKETSSERVER_H_ */
diff --git a/libraries/WebSockets/src/libb64/AUTHORS b/libraries/WebSockets/src/libb64/AUTHORS
new file mode 100644
index 0000000..af68737
--- /dev/null
+++ b/libraries/WebSockets/src/libb64/AUTHORS
@@ -0,0 +1,7 @@
+libb64: Base64 Encoding/Decoding Routines
+======================================
+
+Authors:
+-------
+
+Chris Venter	chris.venter@gmail.com	http://rocketpod.blogspot.com
diff --git a/libraries/WebSockets/src/libb64/LICENSE b/libraries/WebSockets/src/libb64/LICENSE
new file mode 100644
index 0000000..a6b5606
--- /dev/null
+++ b/libraries/WebSockets/src/libb64/LICENSE
@@ -0,0 +1,29 @@
+Copyright-Only Dedication (based on United States law) 
+or Public Domain Certification
+
+The person or persons who have associated work with this document (the
+"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
+his knowledge, the work of authorship identified is in the public domain of the
+country from which the work is published, or (b) hereby dedicates whatever
+copyright the dedicators holds in the work of authorship identified below (the
+"Work") to the public domain. A certifier, moreover, dedicates any copyright
+interest he may have in the associated work, and for these purposes, is
+described as a "dedicator" below.
+
+A certifier has taken reasonable steps to verify the copyright status of this
+work. Certifier recognizes that his good faith efforts may not shield him from
+liability if in fact the work certified is not in the public domain.
+
+Dedicator makes this dedication for the benefit of the public at large and to
+the detriment of the Dedicator's heirs and successors. Dedicator intends this
+dedication to be an overt act of relinquishment in perpetuity of all present
+and future rights under copyright law, whether vested or contingent, in the
+Work. Dedicator understands that such relinquishment of all rights includes
+the relinquishment of all rights to enforce (by lawsuit or otherwise) those
+copyrights in the Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work may be
+freely reproduced, distributed, transmitted, used, modified, built upon, or
+otherwise exploited by anyone for any purpose, commercial or non-commercial,
+and in any way, including by methods that have not yet been invented or
+conceived.
\ No newline at end of file
diff --git a/libraries/WebSockets/src/libb64/cdecode.c b/libraries/WebSockets/src/libb64/cdecode.c
new file mode 100644
index 0000000..0d86d0e
--- /dev/null
+++ b/libraries/WebSockets/src/libb64/cdecode.c
@@ -0,0 +1,94 @@
+/*
+cdecoder.c - c source to a base64 decoding algorithm implementation
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+#ifndef CORE_HAS_LIBB64
+#include "cdecode_inc.h"
+
+int base64_decode_value(char value_in)
+{
+	static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+	static const char decoding_size = sizeof(decoding);
+	value_in -= 43;
+	if (value_in < 0 || value_in > decoding_size) return -1;
+	return decoding[(int)value_in];
+}
+
+void base64_init_decodestate(base64_decodestate* state_in)
+{
+	state_in->step = step_a;
+	state_in->plainchar = 0;
+}
+
+int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in)
+{
+	const char* codechar = code_in;
+	char* plainchar = plaintext_out;
+	char fragment;
+	
+	*plainchar = state_in->plainchar;
+	
+	switch (state_in->step)
+	{
+		while (1)
+		{
+	case step_a:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_a;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar    = (fragment & 0x03f) << 2;
+	case step_b:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_b;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar++ |= (fragment & 0x030) >> 4;
+			*plainchar    = (fragment & 0x00f) << 4;
+	case step_c:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_c;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar++ |= (fragment & 0x03c) >> 2;
+			*plainchar    = (fragment & 0x003) << 6;
+	case step_d:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_d;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar++   |= (fragment & 0x03f);
+		}
+	}
+	/* control should not reach here */
+	return plainchar - plaintext_out;
+}
+
+#endif
diff --git a/libraries/WebSockets/src/libb64/cdecode_inc.h b/libraries/WebSockets/src/libb64/cdecode_inc.h
new file mode 100644
index 0000000..d0d7f48
--- /dev/null
+++ b/libraries/WebSockets/src/libb64/cdecode_inc.h
@@ -0,0 +1,28 @@
+/*
+cdecode.h - c header for a base64 decoding algorithm
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifndef BASE64_CDECODE_H
+#define BASE64_CDECODE_H
+
+typedef enum
+{
+	step_a, step_b, step_c, step_d
+} base64_decodestep;
+
+typedef struct
+{
+	base64_decodestep step;
+	char plainchar;
+} base64_decodestate;
+
+void base64_init_decodestate(base64_decodestate* state_in);
+
+int base64_decode_value(char value_in);
+
+int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in);
+
+#endif /* BASE64_CDECODE_H */
diff --git a/libraries/WebSockets/src/libb64/cencode.c b/libraries/WebSockets/src/libb64/cencode.c
new file mode 100644
index 0000000..7367135
--- /dev/null
+++ b/libraries/WebSockets/src/libb64/cencode.c
@@ -0,0 +1,115 @@
+/*
+cencoder.c - c source to a base64 encoding algorithm implementation
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+#ifndef CORE_HAS_LIBB64
+#include "cencode_inc.h"
+
+const int CHARS_PER_LINE = 72;
+
+void base64_init_encodestate(base64_encodestate* state_in)
+{
+	state_in->step = step_A;
+	state_in->result = 0;
+	state_in->stepcount = 0;
+}
+
+char base64_encode_value(char value_in)
+{
+	static const char* encoding = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	if (value_in > 63) return '=';
+	return encoding[(int)value_in];
+}
+
+int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in)
+{
+	const char* plainchar = plaintext_in;
+	const char* const plaintextend = plaintext_in + length_in;
+	char* codechar = code_out;
+	char result;
+	char fragment;
+	
+	result = state_in->result;
+	
+	switch (state_in->step)
+	{
+		while (1)
+		{
+	case step_A:
+			if (plainchar == plaintextend)
+			{
+				state_in->result = result;
+				state_in->step = step_A;
+				return codechar - code_out;
+			}
+			fragment = *plainchar++;
+			result = (fragment & 0x0fc) >> 2;
+			*codechar++ = base64_encode_value(result);
+			result = (fragment & 0x003) << 4;
+	case step_B:
+			if (plainchar == plaintextend)
+			{
+				state_in->result = result;
+				state_in->step = step_B;
+				return codechar - code_out;
+			}
+			fragment = *plainchar++;
+			result |= (fragment & 0x0f0) >> 4;
+			*codechar++ = base64_encode_value(result);
+			result = (fragment & 0x00f) << 2;
+	case step_C:
+			if (plainchar == plaintextend)
+			{
+				state_in->result = result;
+				state_in->step = step_C;
+				return codechar - code_out;
+			}
+			fragment = *plainchar++;
+			result |= (fragment & 0x0c0) >> 6;
+			*codechar++ = base64_encode_value(result);
+			result  = (fragment & 0x03f) >> 0;
+			*codechar++ = base64_encode_value(result);
+			
+			++(state_in->stepcount);
+			if (state_in->stepcount == CHARS_PER_LINE/4)
+			{
+				*codechar++ = '\n';
+				state_in->stepcount = 0;
+			}
+		}
+	}
+	/* control should not reach here */
+	return codechar - code_out;
+}
+
+int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
+{
+	char* codechar = code_out;
+	
+	switch (state_in->step)
+	{
+	case step_B:
+		*codechar++ = base64_encode_value(state_in->result);
+		*codechar++ = '=';
+		*codechar++ = '=';
+		break;
+	case step_C:
+		*codechar++ = base64_encode_value(state_in->result);
+		*codechar++ = '=';
+		break;
+	case step_A:
+		break;
+	}
+	*codechar++ = 0x00;
+	
+	return codechar - code_out;
+}
+
+#endif
diff --git a/libraries/WebSockets/src/libb64/cencode_inc.h b/libraries/WebSockets/src/libb64/cencode_inc.h
new file mode 100644
index 0000000..c1e3464
--- /dev/null
+++ b/libraries/WebSockets/src/libb64/cencode_inc.h
@@ -0,0 +1,31 @@
+/*
+cencode.h - c header for a base64 encoding algorithm
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifndef BASE64_CENCODE_H
+#define BASE64_CENCODE_H
+
+typedef enum
+{
+	step_A, step_B, step_C
+} base64_encodestep;
+
+typedef struct
+{
+	base64_encodestep step;
+	char result;
+	int stepcount;
+} base64_encodestate;
+
+void base64_init_encodestate(base64_encodestate* state_in);
+
+char base64_encode_value(char value_in);
+
+int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in);
+
+int base64_encode_blockend(char* code_out, base64_encodestate* state_in);
+
+#endif /* BASE64_CENCODE_H */
diff --git a/libraries/WebSockets/src/libsha1/libsha1.c b/libraries/WebSockets/src/libsha1/libsha1.c
new file mode 100644
index 0000000..e6c1f3a
--- /dev/null
+++ b/libraries/WebSockets/src/libsha1/libsha1.c
@@ -0,0 +1,202 @@
+/* from valgrind tests */
+
+/* ================ sha1.c ================ */
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define LITTLE_ENDIAN * This should be #define'd already, if true. */
+/* #define SHA1HANDSOFF * Copies data before messing with it. */
+
+#ifndef ESP8266
+
+#define SHA1HANDSOFF
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "libsha1.h"
+
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#elif BYTE_ORDER == BIG_ENDIAN
+#define blk0(i) block->l[i]
+#else
+#error "Endianness not defined!"
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+
+void SHA1Transform(uint32_t state[5], const unsigned char buffer[64])
+{
+    uint32_t a, b, c, d, e;
+    typedef union {
+        unsigned char c[64];
+        uint32_t l[16];
+    } CHAR64LONG16;
+#ifdef SHA1HANDSOFF
+    CHAR64LONG16 block[1];  /* use array to appear as a pointer */
+    memcpy(block, buffer, 64);
+#else
+    /* The following had better never be used because it causes the
+     * pointer-to-const buffer to be cast into a pointer to non-const.
+     * And the result is written through.  I threw a "const" in, hoping
+     * this will cause a diagnostic.
+     */
+    CHAR64LONG16* block = (const CHAR64LONG16*)buffer;
+#endif
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+#ifdef SHA1HANDSOFF
+    memset(block, '\0', sizeof(block));
+#endif
+}
+
+
+/* SHA1Init - Initialize new context */
+
+void SHA1Init(SHA1_CTX* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+
+void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len)
+{
+    uint32_t i, j;
+
+    j = context->count[0];
+    if ((context->count[0] += len << 3) < j)
+        context->count[1]++;
+    context->count[1] += (len>>29);
+    j = (j >> 3) & 63;
+    if ((j + len) > 63) {
+        memcpy(&context->buffer[j], data, (i = 64-j));
+        SHA1Transform(context->state, context->buffer);
+        for ( ; i + 63 < len; i += 64) {
+            SHA1Transform(context->state, &data[i]);
+        }
+        j = 0;
+    }
+    else i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/* Add padding and return the message digest. */
+
+void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
+{
+    unsigned i;
+    unsigned char finalcount[8];
+    unsigned char c;
+
+#if 0	/* untested "improvement" by DHR */
+    /* Convert context->count to a sequence of bytes
+     * in finalcount.  Second element first, but
+     * big-endian order within element.
+     * But we do it all backwards.
+     */
+    unsigned char *fcp = &finalcount[8];
+
+    for (i = 0; i < 2; i++)
+       {
+        uint32_t t = context->count[i];
+        int j;
+
+        for (j = 0; j < 4; t >>= 8, j++)
+	          *--fcp = (unsigned char) t;
+    }
+#else
+    for (i = 0; i < 8; i++) {
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+#endif
+    c = 0200;
+    SHA1Update(context, &c, 1);
+    while ((context->count[0] & 504) != 448) {
+	c = 0000;
+        SHA1Update(context, &c, 1);
+    }
+    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
+    for (i = 0; i < 20; i++) {
+        digest[i] = (unsigned char)
+         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+    /* Wipe variables */
+    memset(context, '\0', sizeof(*context));
+    memset(&finalcount, '\0', sizeof(finalcount));
+}
+/* ================ end of sha1.c ================ */
+
+
+#endif
diff --git a/libraries/WebSockets/src/libsha1/libsha1.h b/libraries/WebSockets/src/libsha1/libsha1.h
new file mode 100644
index 0000000..81a953f
--- /dev/null
+++ b/libraries/WebSockets/src/libsha1/libsha1.h
@@ -0,0 +1,21 @@
+/* ================ sha1.h ================ */
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+*/
+
+#ifndef ESP8266
+
+typedef struct {
+    uint32_t state[5];
+    uint32_t count[2];
+    unsigned char buffer[64];
+} SHA1_CTX;
+
+void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
+void SHA1Init(SHA1_CTX* context);
+void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len);
+void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
+
+#endif
\ No newline at end of file
diff --git a/libraries/WebSockets/tests/webSocket.html b/libraries/WebSockets/tests/webSocket.html
new file mode 100644
index 0000000..66a2708
--- /dev/null
+++ b/libraries/WebSockets/tests/webSocket.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+
+<script>
+var connection = new WebSocket('ws://10.11.2.1:81/', ['arduino']);
+
+connection.onopen = function () {
+	connection.send('Message from Browser to ESP8266 yay its Working!! ' + new Date()); 
+	connection.send('ping');
+	
+/*	setInterval(function() {
+		connection.send('Time: ' + new Date()); 
+	}, 20);
+*/
+connection.send('Time: ' + new Date()); 
+};
+
+connection.onerror = function (error) {
+	console.log('WebSocket Error ', error);
+};
+
+connection.onmessage = function (e) {
+	console.log('Server: ', e.data);
+	connection.send('Time: ' + new Date()); 
+};
+
+function sendRGB() {
+	var r = parseInt(document.getElementById('r').value).toString(16);
+	var g = parseInt(document.getElementById('g').value).toString(16);
+	var b = parseInt(document.getElementById('b').value).toString(16);
+	if(r.length < 2) { r = '0' + r; }
+	if(g.length < 2) { g = '0' + g; }
+	if(b.length < 2) { b = '0' + b; }
+	var rgb = '#'+r+g+b;
+	console.log('RGB: ' + rgb);
+	connection.send(rgb); 
+}
+
+</script>
+
+</head>
+<body>
+LED Control:<br/>
+<br/>
+R: <input id="r" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+G: <input id="g" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+B: <input id="b" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+</body>
+</html>
\ No newline at end of file
diff --git a/libraries/WebSockets/tests/webSocketServer/index.js b/libraries/WebSockets/tests/webSocketServer/index.js
new file mode 100644
index 0000000..5fc3606
--- /dev/null
+++ b/libraries/WebSockets/tests/webSocketServer/index.js
@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+var WebSocketServer = require('websocket').server;
+var http = require('http');
+ 
+var server = http.createServer(function(request, response) {
+    console.log((new Date()) + ' Received request for ' + request.url);
+    response.writeHead(404);
+    response.end();
+});
+server.listen(81, function() {
+    console.log((new Date()) + ' Server is listening on port 8011');
+});
+ 
+wsServer = new WebSocketServer({
+    httpServer: server,
+    // You should not use autoAcceptConnections for production 
+    // applications, as it defeats all standard cross-origin protection 
+    // facilities built into the protocol and the browser.  You should 
+    // *always* verify the connection's origin and decide whether or not 
+    // to accept it. 
+    autoAcceptConnections: false
+});
+ 
+function originIsAllowed(origin) {
+  // put logic here to detect whether the specified origin is allowed. 
+  return true;
+}
+ 
+wsServer.on('request', function(request) {
+	
+    if (!originIsAllowed(request.origin)) {
+      // Make sure we only accept requests from an allowed origin 
+      request.reject();
+      console.log((new Date()) + ' Connection from origin ' + request.origin + ' rejected.');
+      return;
+    }
+    
+    var connection = request.accept('arduino', request.origin);
+    console.log((new Date()) + ' Connection accepted.');
+    
+	connection.on('message', function(message) {
+        if (message.type === 'utf8') {
+            console.log('Received Message: ' + message.utf8Data);
+           // connection.sendUTF(message.utf8Data);
+        }
+        else if (message.type === 'binary') {
+            console.log('Received Binary Message of ' + message.binaryData.length + ' bytes');
+           //connection.sendBytes(message.binaryData);
+        }
+    });
+    
+	connection.on('close', function(reasonCode, description) {
+        console.log((new Date()) + ' Peer ' + connection.remoteAddress + ' disconnected.');
+    });
+	
+	connection.sendUTF("Hallo Client!");
+});
\ No newline at end of file
diff --git a/libraries/WebSockets/tests/webSocketServer/package.json b/libraries/WebSockets/tests/webSocketServer/package.json
new file mode 100644
index 0000000..9538323
--- /dev/null
+++ b/libraries/WebSockets/tests/webSocketServer/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "webSocketServer",
+  "version": "1.0.0",
+  "description": "WebSocketServer for testing",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Links2004/arduinoWebSockets"
+  },
+  "keywords": [
+    "esp8266",
+    "websocket",
+    "arduino"
+  ],
+  "author": "Markus Sattler",
+  "license": "LGPLv2",
+  "bugs": {
+    "url": "https://github.com/Links2004/arduinoWebSockets/issues"
+  },
+  "homepage": "https://github.com/Links2004/arduinoWebSockets",
+  "dependencies": {
+    "websocket": "^1.0.18"
+  }
+}
diff --git a/libraries/Wiegand-Protocol-Library-for-Arduino/.gitignore b/libraries/Wiegand-Protocol-Library-for-Arduino/.gitignore
new file mode 100644
index 0000000..7664704
--- /dev/null
+++ b/libraries/Wiegand-Protocol-Library-for-Arduino/.gitignore
@@ -0,0 +1 @@
+*.bak
\ No newline at end of file
diff --git a/libraries/Wiegand-Protocol-Library-for-Arduino/README.md b/libraries/Wiegand-Protocol-Library-for-Arduino/README.md
new file mode 100644
index 0000000..b89741d
--- /dev/null
+++ b/libraries/Wiegand-Protocol-Library-for-Arduino/README.md
@@ -0,0 +1,70 @@
+# Wiegand 26 and Wiegand 34 library for Arduino
+
+The Wiegand interface is a de facto standard commonly used to connect a card reader or keypad to an electronic entry system. Wiegand interface has the ability to transmit signal over long distance with a simple 3 wires connection. This library uses interrupt pins from Arduino to read the pulses from Wiegand interface and return the code and type of the Wiegand.
+
+## Requirements
+
+The following are needed 
+
+* [Arduino] (http://www.arduino.cc) Any ATMEGA328 compatible board should work.
+* [Wiegand RFID Reader] (http://www.monkeyboard.org/products/85-developmentboard/84-rfid-wiegand-protocol-development-kit) The code was written for this reader however customers reported working with [HID] (http://www.hidglobal.com/products/cards-and-credentials) compatible readers.
+* DATA0 of Wiegand connects to Arduino PIN 2 and DATA1 of Wiegand connects to Arduino PIN 3
+
+## Installation 
+
+Create a folder named Wiegand in Arduino's libraries folder.  You will have the following folder structure:
+
+	cd arduino/libraries
+	mkdir Wiegand
+	cd Wiegand
+	git clone https://github.com/monkeyboard/Wiegand-Protocol-Library-for-Arduino.git .
+
+## Arduino Sketch
+
+![alt text](http://www.monkeyboard.org/images/tutorials/wiegand/wiegand_arduino.png "RFID Reader to Arduino connection diagram")
+
+
+Execute Arduino IDE, select Example-->Wiegand-->WiegandTest
+
+### Example
+<pre><code>
+#include &lt;Wiegand.h&gt;
+
+WIEGAND wg;
+
+void setup() {
+	Serial.begin(9600);  
+	wg.begin();
+}
+
+void loop() {
+	if(wg.available())
+	{
+		Serial.print("Wiegand HEX = ");
+		Serial.print(wg.getCode(),HEX);
+		Serial.print(", DECIMAL = ");
+		Serial.print(wg.getCode());
+		Serial.print(", Type W");
+		Serial.println(wg.getWiegandType());    
+	}
+}
+</code></pre>
+
+
+## Contributors
+
+[Francesco Uggetti (ugge75)](https://github.com/ugge75) improved this version of library to support multiple readers for ATMEGA2560.  Please check out [his version of multiple wiegand readers library here](https://github.com/ugge75/Wiegand-Protocol-Library-for-Arduino-MEGA-2560)
+
+[Apollon77](https://github.com/Apollon77) improved interrupt safety and removed sysTick from global
+
+[paulfurley](https://github.com/paulfurley) added 4 bit code
+
+[PaulStoffregen](https://github.com/PaulStoffregen) added Use digitalPinToInterrupt on newer Arduino software, if present
+
+Written by [JP Liew](http://jpliew.com)
+
+Project home: http://www.monkeyboard.org/tutorials/82-protocol/24-wiegand-converter
+
+*This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.*
+
+*This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.*
diff --git a/libraries/Wiegand-Protocol-Library-for-Arduino/Wiegand.cpp b/libraries/Wiegand-Protocol-Library-for-Arduino/Wiegand.cpp
new file mode 100644
index 0000000..92c7109
--- /dev/null
+++ b/libraries/Wiegand-Protocol-Library-for-Arduino/Wiegand.cpp
@@ -0,0 +1,188 @@
+#include "Wiegand.h"
+
+volatile unsigned long WIEGAND::_cardTempHigh=0;
+volatile unsigned long WIEGAND::_cardTemp=0;
+volatile unsigned long WIEGAND::_lastWiegand=0;
+unsigned long WIEGAND::_code=0;
+volatile int WIEGAND::_bitCount=0;	
+int WIEGAND::_wiegandType=0;
+
+WIEGAND::WIEGAND()
+{
+}
+
+unsigned long WIEGAND::getCode()
+{
+	return _code;
+}
+
+int WIEGAND::getWiegandType()
+{
+	return _wiegandType;
+}
+
+bool WIEGAND::available()
+{
+	bool ret;
+    noInterrupts();
+	ret=DoWiegandConversion();
+	interrupts();
+	return ret;
+}
+
+void WIEGAND::begin()
+{
+#ifdef digitalPinToInterrupt
+  // newer versions of Arduino provide pin to interrupt mapping
+  begin(2,digitalPinToInterrupt(2),3,digitalPinToInterrupt(3));
+#else
+  begin(2,0,3,1);
+#endif
+}
+
+void WIEGAND::begin(int pinD0, int pinIntD0, int pinD1, int pinIntD1)
+{
+	_lastWiegand = 0;
+	_cardTempHigh = 0;
+	_cardTemp = 0;
+	_code = 0;
+	_wiegandType = 0;
+	_bitCount = 0;  
+	pinMode(pinD0, INPUT);					// Set D0 pin as input
+	pinMode(pinD1, INPUT);					// Set D1 pin as input
+	attachInterrupt(pinIntD0, ReadD0, FALLING);	// Hardware interrupt - high to low pulse
+	attachInterrupt(pinIntD1, ReadD1, FALLING);	// Hardware interrupt - high to low pulse
+}
+
+void WIEGAND::ReadD0 ()
+{
+	_bitCount++;				// Increament bit count for Interrupt connected to D0
+	if (_bitCount>31)			// If bit count more than 31, process high bits
+	{
+		_cardTempHigh |= ((0x80000000 & _cardTemp)>>31);	//	shift value to high bits
+		_cardTempHigh <<= 1;
+		_cardTemp <<=1;
+	}
+	else
+	{
+		_cardTemp <<= 1;		// D0 represent binary 0, so just left shift card data
+	}
+	_lastWiegand = millis();	// Keep track of last wiegand bit received
+}
+
+void WIEGAND::ReadD1()
+{
+	_bitCount ++;				// Increment bit count for Interrupt connected to D1
+	if (_bitCount>31)			// If bit count more than 31, process high bits
+	{
+		_cardTempHigh |= ((0x80000000 & _cardTemp)>>31);	// shift value to high bits
+		_cardTempHigh <<= 1;
+		_cardTemp |= 1;
+		_cardTemp <<=1;
+	}
+	else
+	{
+		_cardTemp |= 1;			// D1 represent binary 1, so OR card data with 1 then
+		_cardTemp <<= 1;		// left shift card data
+	}
+	_lastWiegand = millis();	// Keep track of last wiegand bit received
+}
+
+unsigned long WIEGAND::GetCardId (volatile unsigned long *codehigh, volatile unsigned long *codelow, char bitlength)
+{
+	unsigned long cardID=0;
+
+	if (bitlength==26)								// EM tag
+		cardID = (*codelow & 0x1FFFFFE) >>1;
+
+	if (bitlength==34)								// Mifare 
+	{
+		*codehigh = *codehigh & 0x03;				// only need the 2 LSB of the codehigh
+		*codehigh <<= 30;							// shift 2 LSB to MSB		
+		*codelow >>=1;
+		cardID = *codehigh | *codelow;
+	}
+	return cardID;
+}
+
+char translateEnterEscapeKeyPress(char originalKeyPress) {
+    switch(originalKeyPress) {
+        case 0x0b:        // 11 or * key
+            return 0x0d;  // 13 or ASCII ENTER
+
+        case 0x0a:        // 10 or # key
+            return 0x1b;  // 27 or ASCII ESCAPE
+
+        default:
+            return originalKeyPress;
+    }
+}
+
+bool WIEGAND::DoWiegandConversion ()
+{
+	unsigned long cardID;
+	unsigned long sysTick = millis();
+	
+	if ((sysTick - _lastWiegand) > 25)								// if no more signal coming through after 25ms
+	{
+		if ((_bitCount==26) || (_bitCount==34) || (_bitCount==8) || (_bitCount==4)) 	// bitCount for keypress=4 or 8, Wiegand 26=26, Wiegand 34=34
+		{
+			_cardTemp >>= 1;			// shift right 1 bit to get back the real value - interrupt done 1 left shift in advance
+			if (_bitCount>32)			// bit count more than 32 bits, shift high bits right to make adjustment
+				_cardTempHigh >>= 1;	
+
+			if((_bitCount==26) || (_bitCount==34))		// wiegand 26 or wiegand 34
+			{
+				cardID = GetCardId (&_cardTempHigh, &_cardTemp, _bitCount);
+				_wiegandType=_bitCount;
+				_bitCount=0;
+				_cardTemp=0;
+				_cardTempHigh=0;
+				_code=cardID;
+				return true;				
+			}
+			else if (_bitCount==8)		// keypress wiegand with integrity
+			{
+				// 8-bit Wiegand keyboard data, high nibble is the "NOT" of low nibble
+				// eg if key 1 pressed, data=E1 in binary 11100001 , high nibble=1110 , low nibble = 0001 
+				char highNibble = (_cardTemp & 0xf0) >>4;
+				char lowNibble = (_cardTemp & 0x0f);
+				_wiegandType=_bitCount;					
+				_bitCount=0;
+				_cardTemp=0;
+				_cardTempHigh=0;
+				
+				if (lowNibble == (~highNibble & 0x0f))		// check if low nibble matches the "NOT" of high nibble.
+                {
+                    _code = (int)translateEnterEscapeKeyPress(lowNibble);
+					return true;
+				}
+
+                // TODO: Handle validation failure case!
+			}
+            else if (4 == _bitCount) {
+                // 4-bit Wiegand codes have no data integrity check so we just
+                // read the LOW nibble.
+                _code = (int)translateEnterEscapeKeyPress(_cardTemp & 0x0000000F);
+
+                _wiegandType = _bitCount;
+                _bitCount = 0;
+                _cardTemp = 0;
+                _cardTempHigh = 0;
+
+                return true;
+            }
+		}
+		else
+		{
+			// well time over 25 ms and bitCount !=8 , !=26, !=34 , must be noise or nothing then.
+			_lastWiegand=sysTick;
+			_bitCount=0;			
+			_cardTemp=0;
+			_cardTempHigh=0;
+			return false;
+		}	
+	}
+	else
+		return false;
+}
diff --git a/libraries/Wiegand-Protocol-Library-for-Arduino/Wiegand.h b/libraries/Wiegand-Protocol-Library-for-Arduino/Wiegand.h
new file mode 100644
index 0000000..64bedcb
--- /dev/null
+++ b/libraries/Wiegand-Protocol-Library-for-Arduino/Wiegand.h
@@ -0,0 +1,34 @@
+#ifndef _WIEGAND_H
+#define _WIEGAND_H
+
+#if defined(ARDUINO) && ARDUINO >= 100
+#include "Arduino.h"
+#else
+#include "WProgram.h"
+#endif
+
+class WIEGAND {
+
+public:
+	WIEGAND();
+	void begin();
+	void begin(int pinD0, int pinIntD0, int pinD1, int pinIntD1);
+	bool available();
+	unsigned long getCode();
+	int getWiegandType();
+	
+private:
+	static void ReadD0();
+	static void ReadD1();
+	static bool DoWiegandConversion ();
+	static unsigned long GetCardId (volatile unsigned long *codehigh, volatile unsigned long *codelow, char bitlength);
+	
+	static volatile unsigned long 	_cardTempHigh;
+	static volatile unsigned long 	_cardTemp;
+	static volatile unsigned long 	_lastWiegand;
+	static volatile int				_bitCount;	
+	static int				_wiegandType;
+	static unsigned long	_code;
+};
+
+#endif
diff --git a/libraries/Wiegand-Protocol-Library-for-Arduino/examples/WiegandTest/WiegandTest.ino b/libraries/Wiegand-Protocol-Library-for-Arduino/examples/WiegandTest/WiegandTest.ino
new file mode 100644
index 0000000..e424c09
--- /dev/null
+++ b/libraries/Wiegand-Protocol-Library-for-Arduino/examples/WiegandTest/WiegandTest.ino
@@ -0,0 +1,20 @@
+#include <Wiegand.h>
+
+WIEGAND wg;
+
+void setup() {
+	Serial.begin(9600);  
+	wg.begin();
+}
+
+void loop() {
+	if(wg.available())
+	{
+		Serial.print("Wiegand HEX = ");
+		Serial.print(wg.getCode(),HEX);
+		Serial.print(", DECIMAL = ");
+		Serial.print(wg.getCode());
+		Serial.print(", Type W");
+		Serial.println(wg.getWiegandType());    
+	}
+}
\ No newline at end of file
diff --git a/libraries/Wiegand-Protocol-Library-for-Arduino/keywords.txt b/libraries/Wiegand-Protocol-Library-for-Arduino/keywords.txt
new file mode 100644
index 0000000..9bbe327
--- /dev/null
+++ b/libraries/Wiegand-Protocol-Library-for-Arduino/keywords.txt
@@ -0,0 +1,21 @@
+#######################################
+# Syntax Coloring Map For Wiegand Library
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+WIEGAND	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+getCode	KEYWORD2
+getWiegandType	KEYWORD2
+available	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/libraries/arduinoWebSockets/.gitignore b/libraries/arduinoWebSockets/.gitignore
new file mode 100644
index 0000000..44b2c85
--- /dev/null
+++ b/libraries/arduinoWebSockets/.gitignore
@@ -0,0 +1,29 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+/tests/webSocketServer/node_modules
diff --git a/libraries/arduinoWebSockets/LICENSE b/libraries/arduinoWebSockets/LICENSE
new file mode 100644
index 0000000..f166cc5
--- /dev/null
+++ b/libraries/arduinoWebSockets/LICENSE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/README.md b/libraries/arduinoWebSockets/README.md
new file mode 100644
index 0000000..f518174
--- /dev/null
+++ b/libraries/arduinoWebSockets/README.md
@@ -0,0 +1,61 @@
+WebSocket Server and Client for Arduino
+===========================================
+
+a WebSocket Server and Client for Arduino based on RFC6455.
+
+ 
+##### Supported features of RFC6455 #####
+ - text frame
+ - binary frame
+ - connection close
+ - ping
+ - pong
+ 
+##### Not supported features of RFC6455 #####
+ - continuation frame
+  
+##### Limitations #####
+ - max input length is limited to the ram size and the ```WEBSOCKETS_MAX_DATA_SIZE``` define
+ - max output length has no limit (the hardware is the limit)
+ - Client send big frames with mask 0x00000000 (on AVR all frames)
+ 
+ ##### Limitations for Async #####
+ - Functions called from within the context of the websocket event might not honor `yield()` and/or `delay()`.  See [this issue](https://github.com/Links2004/arduinoWebSockets/issues/58#issuecomment-192376395) for more info and a potential workaround.
+ - wss / SSL is not possible.
+ 
+##### Supported Hardware #####
+ - ESP8266 [Arduino for ESP8266](https://github.com/Links2004/Arduino)
+ - ESP31B
+ - ATmega328 with Ethernet Shield (ATmega branch) 
+ - ATmega328 with enc28j60 (ATmega branch) 
+ - ATmega2560 with Ethernet Shield (ATmega branch) 
+ - ATmega2560 with enc28j60 (ATmega branch) 
+ 
+###### Note: ######
+
+  version 2.0 and up is not compatible with AVR/ATmega, check ATmega branch.
+  
+  Arduino for AVR not supports std namespace of c++.
+ 
+### wss / SSL ###
+ supported for:
+ - wss client on the ESP8266
+ 
+### ESP Async TCP ###
+
+This libary can run in Async TCP mode on the ESP.
+
+The mode can be aktivated in the ```WebSockets.h``` (see WEBSOCKETS_NETWORK_TYPE define).
+
+[ESPAsyncTCP](https://github.com/me-no-dev/ESPAsyncTCP) libary is required.
+
+### Issues ###
+Submit issues to: https://github.com/Links2004/arduinoWebSockets/issues
+
+[![Join the chat at https://gitter.im/Links2004/arduinoWebSockets](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Links2004/arduinoWebSockets?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+### License and credits ###
+
+The library is licensed under [LGPLv2.1](https://github.com/Links2004/arduinoWebSockets/blob/master/LICENSE)
+
+[libb64](http://libb64.sourceforge.net/) written by Chris Venter. It is distributed under Public Domain see [LICENSE](https://github.com/Links2004/arduinoWebSockets/blob/master/src/libb64/LICENSE).
diff --git a/libraries/arduinoWebSockets/examples/WebSocketClient/WebSocketClient.ino b/libraries/arduinoWebSockets/examples/WebSocketClient/WebSocketClient.ino
new file mode 100644
index 0000000..7a64302
--- /dev/null
+++ b/libraries/arduinoWebSockets/examples/WebSocketClient/WebSocketClient.ino
@@ -0,0 +1,87 @@
+/*
+ * WebSocketClient.ino
+ *
+ *  Created on: 24.05.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+#include <WebSocketsClient.h>
+
+#include <Hash.h>
+
+ESP8266WiFiMulti WiFiMulti;
+WebSocketsClient webSocket;
+
+
+#define USE_SERIAL Serial1
+
+void webSocketEvent(WStype_t type, uint8_t * payload, size_t lenght) {
+
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[WSc] Disconnected!\n");
+            break;
+        case WStype_CONNECTED:
+            {
+                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
+				
+			    // send message to server when Connected
+				webSocket.sendTXT("Connected");
+            }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
+
+			// send message to server
+			// webSocket.sendTXT("message here");
+            break;
+        case WStype_BIN:
+            USE_SERIAL.printf("[WSc] get binary lenght: %u\n", lenght);
+            hexdump(payload, lenght);
+
+            // send data to server
+            // webSocket.sendBIN(payload, lenght);
+            break;
+    }
+
+}
+
+void setup() {
+    // USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //Serial.setDebugOutput(true);
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+      for(uint8_t t = 4; t > 0; t--) {
+          USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+          USE_SERIAL.flush();
+          delay(1000);
+      }
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    //WiFi.disconnect();
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    webSocket.begin("192.168.0.123", 81);
+    //webSocket.setAuthorization("user", "Password"); // HTTP Basic Authorization
+    webSocket.onEvent(webSocketEvent);
+
+}
+
+void loop() {
+    webSocket.loop();
+}
diff --git a/libraries/arduinoWebSockets/examples/WebSocketClientAVR/WebSocketClientAVR.ino b/libraries/arduinoWebSockets/examples/WebSocketClientAVR/WebSocketClientAVR.ino
new file mode 100644
index 0000000..9d49d14
--- /dev/null
+++ b/libraries/arduinoWebSockets/examples/WebSocketClientAVR/WebSocketClientAVR.ino
@@ -0,0 +1,84 @@
+/*
+ * WebSocketClientAVR.ino
+ *
+ *  Created on: 10.12.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <SPI.h>
+#include <Ethernet.h>
+
+#include <WebSocketsClient.h>
+
+
+
+// Enter a MAC address for your controller below.
+// Newer Ethernet shields have a MAC address printed on a sticker on the shield
+byte mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+
+// Set the static IP address to use if the DHCP fails to assign
+IPAddress ip(192, 168, 0, 177);
+
+WebSocketsClient webSocket;
+
+
+
+void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
+
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            Serial.println("[WSc] Disconnected!\n");
+            break;
+        case WStype_CONNECTED:
+            {
+                Serial.print("[WSc] Connected to url: ");
+                Serial.println((char *)payload);
+                // send message to server when Connected
+                webSocket.sendTXT("Connected");
+            }
+            break;
+        case WStype_TEXT:
+            Serial.print("[WSc] get text: ");
+            Serial.println((char *)payload);
+            // send message to server
+            // webSocket.sendTXT("message here");
+            break;
+        case WStype_BIN:
+            Serial.print("[WSc] get binary length: ");
+            Serial.println(length);
+           // hexdump(payload, length);
+
+            // send data to server
+            // webSocket.sendBIN(payload, length);
+            break;
+    }
+
+}
+
+void setup()
+{
+    // Open serial communications and wait for port to open:
+    Serial.begin(115200);
+    while (!Serial) {}
+
+    // start the Ethernet connection:
+    if (Ethernet.begin(mac) == 0) {
+      Serial.println("Failed to configure Ethernet using DHCP");
+      // no point in carrying on, so do nothing forevermore:
+      // try to congifure using IP address instead of DHCP:
+      Ethernet.begin(mac, ip);
+    }
+
+    webSocket.begin("192.168.0.123", 8011);
+    webSocket.onEvent(webSocketEvent);
+
+}
+
+
+void loop()
+{
+    webSocket.loop();
+}
diff --git a/libraries/arduinoWebSockets/examples/WebSocketClientSSL/WebSocketClientSSL.ino b/libraries/arduinoWebSockets/examples/WebSocketClientSSL/WebSocketClientSSL.ino
new file mode 100644
index 0000000..d45060e
--- /dev/null
+++ b/libraries/arduinoWebSockets/examples/WebSocketClientSSL/WebSocketClientSSL.ino
@@ -0,0 +1,88 @@
+/*
+ * WebSocketClientSSL.ino
+ *
+ *  Created on: 10.12.2015
+ *
+ *  note SSL is only possible with the ESP8266
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+#include <WebSocketsClient.h>
+
+#include <Hash.h>
+
+ESP8266WiFiMulti WiFiMulti;
+WebSocketsClient webSocket;
+
+
+#define USE_SERIAL Serial1
+
+void webSocketEvent(WStype_t type, uint8_t * payload, size_t length) {
+
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[WSc] Disconnected!\n");
+            break;
+        case WStype_CONNECTED:
+            {
+                USE_SERIAL.printf("[WSc] Connected to url: %s\n",  payload);
+				
+			    // send message to server when Connected
+				webSocket.sendTXT("Connected");
+            }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[WSc] get text: %s\n", payload);
+
+			// send message to server
+			// webSocket.sendTXT("message here");
+            break;
+        case WStype_BIN:
+            USE_SERIAL.printf("[WSc] get binary length: %u\n", length);
+            hexdump(payload, length);
+
+            // send data to server
+            // webSocket.sendBIN(payload, length);
+            break;
+    }
+
+}
+
+void setup() {
+    // USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //Serial.setDebugOutput(true);
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+      for(uint8_t t = 4; t > 0; t--) {
+          USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+          USE_SERIAL.flush();
+          delay(1000);
+      }
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    //WiFi.disconnect();
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    webSocket.beginSSL("192.168.0.123", 81);
+    webSocket.onEvent(webSocketEvent);
+
+}
+
+void loop() {
+    webSocket.loop();
+}
diff --git a/libraries/arduinoWebSockets/examples/WebSocketServer/WebSocketServer.ino b/libraries/arduinoWebSockets/examples/WebSocketServer/WebSocketServer.ino
new file mode 100644
index 0000000..1efcfdf
--- /dev/null
+++ b/libraries/arduinoWebSockets/examples/WebSocketServer/WebSocketServer.ino
@@ -0,0 +1,86 @@
+/*
+ * WebSocketServer.ino
+ *
+ *  Created on: 22.05.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+#include <WebSocketsServer.h>
+#include <Hash.h>
+
+ESP8266WiFiMulti WiFiMulti;
+
+WebSocketsServer webSocket = WebSocketsServer(81);
+
+#define USE_SERIAL Serial1
+
+void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght) {
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[%u] Disconnected!\n", num);
+            break;
+        case WStype_CONNECTED:
+            {
+                IPAddress ip = webSocket.remoteIP(num);
+                USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+				
+				// send message to client
+				webSocket.sendTXT(num, "Connected");
+            }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
+
+            // send message to client
+            // webSocket.sendTXT(num, "message here");
+
+            // send data to all connected clients
+            // webSocket.broadcastTXT("message here");
+            break;
+        case WStype_BIN:
+            USE_SERIAL.printf("[%u] get binary lenght: %u\n", num, lenght);
+            hexdump(payload, lenght);
+
+            // send message to client
+            // webSocket.sendBIN(num, payload, lenght);
+            break;
+    }
+
+}
+
+void setup() {
+    // USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //Serial.setDebugOutput(true);
+    USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    webSocket.begin();
+    webSocket.onEvent(webSocketEvent);
+}
+
+void loop() {
+    webSocket.loop();
+}
+
diff --git a/libraries/arduinoWebSockets/examples/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino b/libraries/arduinoWebSockets/examples/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino
new file mode 100644
index 0000000..b71b7cd
--- /dev/null
+++ b/libraries/arduinoWebSockets/examples/WebSocketServer_LEDcontrol/WebSocketServer_LEDcontrol.ino
@@ -0,0 +1,122 @@
+/*
+ * WebSocketServer_LEDcontrol.ino
+ *
+ *  Created on: 26.11.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+#include <WebSocketsServer.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+#include <Hash.h>
+
+#define LED_RED     15
+#define LED_GREEN   12
+#define LED_BLUE    13
+
+#define USE_SERIAL Serial
+
+
+ESP8266WiFiMulti WiFiMulti;
+
+ESP8266WebServer server = ESP8266WebServer(80);
+WebSocketsServer webSocket = WebSocketsServer(81);
+
+void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght) {
+
+    switch(type) {
+        case WStype_DISCONNECTED:
+            USE_SERIAL.printf("[%u] Disconnected!\n", num);
+            break;
+        case WStype_CONNECTED: {
+            IPAddress ip = webSocket.remoteIP(num);
+            USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n", num, ip[0], ip[1], ip[2], ip[3], payload);
+
+            // send message to client
+            webSocket.sendTXT(num, "Connected");
+        }
+            break;
+        case WStype_TEXT:
+            USE_SERIAL.printf("[%u] get Text: %s\n", num, payload);
+
+            if(payload[0] == '#') {
+                // we get RGB data
+
+                // decode rgb data
+                uint32_t rgb = (uint32_t) strtol((const char *) &payload[1], NULL, 16);
+
+                analogWrite(LED_RED,    ((rgb >> 16) & 0xFF));
+                analogWrite(LED_GREEN,  ((rgb >> 8) & 0xFF));
+                analogWrite(LED_BLUE,   ((rgb >> 0) & 0xFF));
+            }
+
+            break;
+    }
+
+}
+
+void setup() {
+    //USE_SERIAL.begin(921600);
+    USE_SERIAL.begin(115200);
+
+    //USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    pinMode(LED_RED, OUTPUT);
+    pinMode(LED_GREEN, OUTPUT);
+    pinMode(LED_BLUE, OUTPUT);
+
+    digitalWrite(LED_RED, 1);
+    digitalWrite(LED_GREEN, 1);
+    digitalWrite(LED_BLUE, 1);
+
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        delay(100);
+    }
+
+    // start webSocket server
+    webSocket.begin();
+    webSocket.onEvent(webSocketEvent);
+
+    if(MDNS.begin("esp8266")) {
+        USE_SERIAL.println("MDNS responder started");
+    }
+
+    // handle index
+    server.on("/", []() {
+        // send index.html
+        server.send(200, "text/html", "<html><head><script>var connection = new WebSocket('ws://'+location.hostname+':81/', ['arduino']);connection.onopen = function () {  connection.send('Connect ' + new Date()); }; connection.onerror = function (error) {    console.log('WebSocket Error ', error);};connection.onmessage = function (e) {  console.log('Server: ', e.data);};function sendRGB() {  var r = parseInt(document.getElementById('r').value).toString(16);  var g = parseInt(document.getElementById('g').value).toString(16);  var b = parseInt(document.getElementById('b').value).toString(16);  if(r.length < 2) { r = '0' + r; }   if(g.length < 2) { g = '0' + g; }   if(b.length < 2) { b = '0' + b; }   var rgb = '#'+r+g+b;    console.log('RGB: ' + rgb); connection.send(rgb); }</script></head><body>LED Control:<br/><br/>R: <input id=\"r\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/>G: <input id=\"g\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/>B: <input id=\"b\" type=\"range\" min=\"0\" max=\"255\" step=\"1\" onchange=\"sendRGB();\" /><br/></body></html>");
+    });
+
+    server.begin();
+
+    // Add service to MDNS
+    MDNS.addService("http", "tcp", 80);
+    MDNS.addService("ws", "tcp", 81);
+
+    digitalWrite(LED_RED, 0);
+    digitalWrite(LED_GREEN, 0);
+    digitalWrite(LED_BLUE, 0);
+
+}
+
+void loop() {
+    webSocket.loop();
+    server.handleClient();
+}
+
diff --git a/libraries/arduinoWebSockets/library.json b/libraries/arduinoWebSockets/library.json
new file mode 100644
index 0000000..14bae5d
--- /dev/null
+++ b/libraries/arduinoWebSockets/library.json
@@ -0,0 +1,19 @@
+{
+  "name": "WebSockets",
+  "keywords": "wifi, http, web, server, client, websocket",
+  "description": "WebSocket Server and Client for Arduino based on RFC6455",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/Links2004/arduinoWebSockets.git"
+  },
+  "exclude": "tests",
+  "frameworks": "arduino",
+  "platforms": "*",
+  "authors":
+  {
+    "name": "Markus Sattler",
+    "url": "https://github.com/Links2004",
+    "maintainer": true
+  }
+}
diff --git a/libraries/arduinoWebSockets/library.properties b/libraries/arduinoWebSockets/library.properties
new file mode 100644
index 0000000..85f8dff
--- /dev/null
+++ b/libraries/arduinoWebSockets/library.properties
@@ -0,0 +1,9 @@
+name=WebSockets
+version=2.0.2
+author=Markus Sattler
+maintainer=Markus Sattler 
+sentence=WebSockets for Arduino (Server + Client)
+paragraph=use 2.x.x for ESP and 1.3 for AVR
+category=Communication
+url=https://github.com/Links2004/arduinoWebSockets
+architectures=*
diff --git a/libraries/arduinoWebSockets/src/WebSockets.cpp b/libraries/arduinoWebSockets/src/WebSockets.cpp
new file mode 100644
index 0000000..671a811
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/WebSockets.cpp
@@ -0,0 +1,599 @@
+/**
+ * @file WebSockets.cpp
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "WebSockets.h"
+
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+extern "C" {
+#ifdef CORE_HAS_LIBB64
+#include <libb64/cencode.h>
+#else
+#include "libb64/cencode_inc.h"
+#endif
+}
+
+#ifdef ESP8266
+#include <Hash.h>
+#else
+
+extern "C" {
+#include "libsha1/libsha1.h"
+}
+
+#endif
+
+/**
+ *
+ * @param client WSclient_t *  ptr to the client struct
+ * @param code uint16_t see RFC
+ * @param reason
+ * @param reasonLen
+ */
+void WebSockets::clientDisconnect(WSclient_t * client, uint16_t code, char * reason, size_t reasonLen) {
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] clientDisconnect code: %u\n", client->num, code);
+    if(client->status == WSC_CONNECTED && code) {
+        if(reason) {
+            sendFrame(client, WSop_close, (uint8_t *) reason, reasonLen);
+        } else {
+            uint8_t buffer[2];
+            buffer[0] = ((code >> 8) & 0xFF);
+            buffer[1] = (code & 0xFF);
+            sendFrame(client, WSop_close, &buffer[0], 2);
+        }
+    }
+    clientDisconnect(client);
+}
+
+/**
+ *
+ * @param client WSclient_t *   ptr to the client struct
+ * @param opcode WSopcode_t
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param mask bool             add dummy mask to the frame (needed for web browser)
+ * @param fin bool              can be used to send data in more then one frame (set fin on the last frame)
+ * @param headerToPayload bool  set true if the payload has reserved 14 Byte at the beginning to dynamically add the Header (payload neet to be in RAM!)
+ * @return true if ok
+ */
+bool WebSockets::sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length, bool mask, bool fin, bool headerToPayload) {
+
+    if(client->tcp && !client->tcp->connected()) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] not Connected!?\n", client->num);
+        return false;
+    }
+
+    if(client->status != WSC_CONNECTED) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] not in WSC_CONNECTED state!?\n", client->num);
+        return false;
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] ------- send massage frame -------\n", client->num);
+    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] fin: %u opCode: %u mask: %u length: %u headerToPayload: %u\n", client->num, fin, opcode, mask, length, headerToPayload);
+
+    if(opcode == WSop_text) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] text: %s\n", client->num, (payload + (headerToPayload ? 14 : 0)));
+    }
+
+    uint8_t maskKey[4] = { 0x00, 0x00, 0x00, 0x00 };
+    uint8_t buffer[WEBSOCKETS_MAX_HEADER_SIZE] = { 0 };
+
+    uint8_t headerSize;
+    uint8_t * headerPtr;
+    uint8_t * payloadPtr = payload;
+    bool useInternBuffer = false;
+    bool ret = true;
+
+    // calculate header Size
+    if(length < 126) {
+        headerSize = 2;
+    } else if(length < 0xFFFF) {
+        headerSize = 4;
+    } else {
+        headerSize = 10;
+    }
+
+    if(mask) {
+        headerSize += 4;
+    }
+
+#ifdef WEBSOCKETS_USE_BIG_MEM
+    // only for ESP since AVR has less HEAP
+    // try to send data in one TCP package (only if some free Heap is there)
+    if(!headerToPayload && ((length > 0) && (length < 1400)) && (ESP.getFreeHeap() > 6000)) {
+        DEBUG_WEBSOCKETS("[WS][%d][sendFrame] pack to one TCP package...\n", client->num);
+        uint8_t * dataPtr = (uint8_t *) malloc(length + WEBSOCKETS_MAX_HEADER_SIZE);
+        if(dataPtr) {
+            memcpy((dataPtr + WEBSOCKETS_MAX_HEADER_SIZE), payload, length);
+            headerToPayload = true;
+            useInternBuffer = true;
+            payloadPtr = dataPtr;
+        }
+    }
+#endif
+
+    // set Header Pointer
+    if(headerToPayload) {
+        // calculate offset in payload
+        headerPtr = (payloadPtr + (WEBSOCKETS_MAX_HEADER_SIZE - headerSize));
+    } else {
+        headerPtr = &buffer[0];
+    }
+
+    // create header
+
+    // byte 0
+    *headerPtr = 0x00;
+    if(fin) {
+        *headerPtr |= bit(7);    ///< set Fin
+    }
+    *headerPtr |= opcode;        ///< set opcode
+    headerPtr++;
+
+    // byte 1
+    *headerPtr = 0x00;
+    if(mask) {
+        *headerPtr |= bit(7);    ///< set mask
+    }
+
+    if(length < 126) {
+        *headerPtr |= length;
+        headerPtr++;
+    } else if(length < 0xFFFF) {
+        *headerPtr |= 126;
+        headerPtr++;
+        *headerPtr = ((length >> 8) & 0xFF);
+        headerPtr++;
+        *headerPtr = (length & 0xFF);
+        headerPtr++;
+    } else {
+        // Normally we never get here (to less memory)
+        *headerPtr |= 127;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = 0x00;
+        headerPtr++;
+        *headerPtr = ((length >> 24) & 0xFF);
+        headerPtr++;
+        *headerPtr = ((length >> 16) & 0xFF);
+        headerPtr++;
+        *headerPtr = ((length >> 8) & 0xFF);
+        headerPtr++;
+        *headerPtr = (length & 0xFF);
+        headerPtr++;
+    }
+
+    if(mask) {
+        if(useInternBuffer) {
+            // if we use a Intern Buffer we can modify the data
+            // by this fact its possible the do the masking
+            for(uint8_t x = 0; x < sizeof(maskKey); x++) {
+                maskKey[x] = random(0xFF);
+                *headerPtr = maskKey[x];
+                headerPtr++;
+            }
+
+            uint8_t * dataMaskPtr;
+
+            if(headerToPayload) {
+                dataMaskPtr = (payloadPtr + WEBSOCKETS_MAX_HEADER_SIZE);
+            } else {
+                dataMaskPtr = payloadPtr;
+            }
+
+            for(size_t x = 0; x < length; x++) {
+                dataMaskPtr[x] = (dataMaskPtr[x] ^ maskKey[x % 4]);
+            }
+
+        } else {
+            *headerPtr = maskKey[0];
+            headerPtr++;
+            *headerPtr = maskKey[1];
+            headerPtr++;
+            *headerPtr = maskKey[2];
+            headerPtr++;
+            *headerPtr = maskKey[3];
+            headerPtr++;
+        }
+    }
+
+#ifndef NODEBUG_WEBSOCKETS
+    unsigned long start = micros();
+#endif
+
+    if(headerToPayload) {
+        // header has be added to payload
+        // payload is forced to reserved 14 Byte but we may not need all based on the length and mask settings
+        // offset in payload is calculatetd 14 - headerSize
+        if(client->tcp->write(&payloadPtr[(WEBSOCKETS_MAX_HEADER_SIZE - headerSize)], (length + headerSize)) != (length + headerSize)) {
+            ret = false;
+        }
+    } else {
+        // send header
+        if(client->tcp->write(&buffer[0], headerSize) != headerSize) {
+            ret = false;
+        }
+
+        if(payloadPtr && length > 0) {
+            // send payload
+            if(client->tcp->write(&payloadPtr[0], length) != length) {
+                ret = false;
+            }
+        }
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][sendFrame] sending Frame Done (%uus).\n", client->num, (micros() - start));
+
+#ifdef WEBSOCKETS_USE_BIG_MEM
+    if(useInternBuffer && payloadPtr) {
+        free(payloadPtr);
+    }
+#endif
+
+    return ret;
+}
+
+/**
+ * callen when HTTP header is done
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSockets::headerDone(WSclient_t * client) {
+    client->status = WSC_CONNECTED;
+    client->cWsRXsize = 0;
+    DEBUG_WEBSOCKETS("[WS][%d][headerDone] Header Handling Done (%uus).\n", client->num);
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    client->cHttpLine = "";
+    handleWebsocket(client);
+#endif
+}
+
+/**
+ * handle the WebSocket stream
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSockets::handleWebsocket(WSclient_t * client) {
+    if(client->cWsRXsize == 0) {
+        handleWebsocketCb(client);
+    }
+}
+
+/**
+ * wait for
+ * @param client
+ * @param size
+ */
+bool WebSockets::handleWebsocketWaitFor(WSclient_t * client, size_t size) {
+    if(!client->tcp || !client->tcp->connected()) {
+        return false;
+    }
+
+    if(size > WEBSOCKETS_MAX_HEADER_SIZE) {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor] size: %d to big!\n", client->num, size);
+        return false;
+    }
+
+    if(client->cWsRXsize >= size) {
+        return true;
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor] size: %d cWsRXsize: %d\n", client->num, size, client->cWsRXsize);
+    readCb(client, &client->cWsHeader[client->cWsRXsize], (size - client->cWsRXsize), std::bind([](WebSockets * server, size_t size, WSclient_t * client, bool ok) {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocketWaitFor][readCb] size: %d ok: %d\n", client->num, size, ok);
+        if(ok) {
+            client->cWsRXsize = size;
+            server->handleWebsocketCb(client);
+        } else {
+            DEBUG_WEBSOCKETS("[WS][%d][readCb] failed.\n", client->num);
+            client->cWsRXsize = 0;
+            // timeout or error
+            server->clientDisconnect(client, 1002);
+        }
+    }, this, size, std::placeholders::_1, std::placeholders::_2));
+    return false;
+}
+
+void WebSockets::handleWebsocketCb(WSclient_t * client) {
+
+    if(!client->tcp || !client->tcp->connected()) {
+        return;
+    }
+
+    uint8_t * buffer = client->cWsHeader;
+
+    WSMessageHeader_t * header = &client->cWsHeaderDecode;
+    uint8_t * payload = NULL;
+
+    uint8_t headerLen = 2;
+
+    if(!handleWebsocketWaitFor(client, headerLen)) {
+        return;
+    }
+
+    // split first 2 bytes in the data
+    header->fin = ((*buffer >> 7) & 0x01);
+    header->rsv1 = ((*buffer >> 6) & 0x01);
+    header->rsv2 = ((*buffer >> 5) & 0x01);
+    header->rsv3 = ((*buffer >> 4) & 0x01);
+    header->opCode = (WSopcode_t) (*buffer & 0x0F);
+    buffer++;
+
+    header->mask = ((*buffer >> 7) & 0x01);
+    header->payloadLen = (WSopcode_t) (*buffer & 0x7F);
+    buffer++;
+
+    if(header->payloadLen == 126) {
+        headerLen += 2;
+        if(!handleWebsocketWaitFor(client, headerLen)) {
+            return;
+        }
+        header->payloadLen = buffer[0] << 8 | buffer[1];
+        buffer += 2;
+    } else if(header->payloadLen == 127) {
+        headerLen += 8;
+        // read 64bit integer as length
+        if(!handleWebsocketWaitFor(client, headerLen)) {
+            return;
+        }
+
+        if(buffer[0] != 0 || buffer[1] != 0 || buffer[2] != 0 || buffer[3] != 0) {
+            // really to big!
+            header->payloadLen = 0xFFFFFFFF;
+        } else {
+            header->payloadLen = buffer[4] << 24 | buffer[5] << 16 | buffer[6] << 8 | buffer[7];
+        }
+        buffer += 8;
+    }
+
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] ------- read massage frame -------\n", client->num);
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] fin: %u rsv1: %u rsv2: %u rsv3 %u  opCode: %u\n", client->num, header->fin, header->rsv1, header->rsv2, header->rsv3, header->opCode);
+    DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] mask: %u payloadLen: %u\n", client->num, header->mask, header->payloadLen);
+
+    if(header->payloadLen > WEBSOCKETS_MAX_DATA_SIZE) {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] payload to big! (%u)\n", client->num, header->payloadLen);
+        clientDisconnect(client, 1009);
+        return;
+    }
+
+    if(header->mask) {
+        headerLen += 4;
+        if(!handleWebsocketWaitFor(client, headerLen)) {
+            return;
+        }
+        header->maskKey = buffer;
+        buffer += 4;
+    }
+
+    if(header->payloadLen > 0) {
+        // if text data we need one more
+        payload = (uint8_t *) malloc(header->payloadLen + 1);
+
+        if(!payload) {
+            DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] to less memory to handle payload %d!\n", client->num, header->payloadLen);
+            clientDisconnect(client, 1011);
+            return;
+        }
+        readCb(client, payload, header->payloadLen, std::bind(&WebSockets::handleWebsocketPayloadCb, this, std::placeholders::_1, std::placeholders::_2, payload));
+    } else {
+        handleWebsocketPayloadCb(client, true, NULL);
+    }
+}
+
+void WebSockets::handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload) {
+
+    WSMessageHeader_t * header = &client->cWsHeaderDecode;
+    if(ok) {
+        if(header->payloadLen > 0) {
+            payload[header->payloadLen] = 0x00;
+
+            if(header->mask) {
+                //decode XOR
+                for(size_t i = 0; i < header->payloadLen; i++) {
+                    payload[i] = (payload[i] ^ header->maskKey[i % 4]);
+                }
+            }
+        }
+
+        switch(header->opCode) {
+            case WSop_text:
+                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] text: %s\n", client->num, payload);
+                // no break here!
+            case WSop_binary:
+                messageRecived(client, header->opCode, payload, header->payloadLen);
+                break;
+            case WSop_ping:
+                // send pong back
+                sendFrame(client, WSop_pong, payload, header->payloadLen);
+                break;
+            case WSop_pong:
+                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get pong  (%s)\n", client->num, payload);
+                break;
+            case WSop_close: {
+                uint16_t reasonCode = 1000;
+                if(header->payloadLen >= 2) {
+                    reasonCode = payload[0] << 8 | payload[1];
+                }
+
+                DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get ask for close. Code: %d", client->num, reasonCode);
+                if(header->payloadLen > 2) {
+                    DEBUG_WEBSOCKETS(" (%s)\n", (payload + 2));
+                } else {
+                    DEBUG_WEBSOCKETS("\n");
+                }
+                clientDisconnect(client, 1000);
+            }
+                break;
+            case WSop_continuation:
+                // continuation is not supported
+                clientDisconnect(client, 1003);
+                break;
+            default:
+                clientDisconnect(client, 1002);
+                break;
+        }
+
+        if(payload) {
+            free(payload);
+        }
+
+        // reset input
+        client->cWsRXsize = 0;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        //register callback for next message
+        handleWebsocketWaitFor(client, 2);
+#endif
+
+    } else {
+        DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] missing data!\n", client->num);
+        free(payload);
+        clientDisconnect(client, 1002);
+    }
+}
+
+/**
+ * generate the key for Sec-WebSocket-Accept
+ * @param clientKey String
+ * @return String Accept Key
+ */
+String WebSockets::acceptKey(String & clientKey) {
+    uint8_t sha1HashBin[20] = { 0 };
+#ifdef ESP8266
+    sha1(clientKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", &sha1HashBin[0]);
+#else
+    clientKey += "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+    SHA1_CTX ctx;
+    SHA1Init(&ctx);
+    SHA1Update(&ctx, (const unsigned char*)clientKey.c_str(), clientKey.length());
+    SHA1Final(&sha1HashBin[0], &ctx);
+#endif
+
+    String key = base64_encode(sha1HashBin, 20);
+    key.trim();
+
+    return key;
+}
+
+/**
+ * base64_encode
+ * @param data uint8_t *
+ * @param length size_t
+ * @return base64 encoded String
+ */
+String WebSockets::base64_encode(uint8_t * data, size_t length) {
+    size_t size = ((length * 1.6f) + 1);
+    char * buffer = (char *) malloc(size);
+    if(buffer) {
+        base64_encodestate _state;
+        base64_init_encodestate(&_state);
+        int len = base64_encode_block((const char *) &data[0], length, &buffer[0], &_state);
+        len = base64_encode_blockend((buffer + len), &_state);
+
+        String base64 = String(buffer);
+        free(buffer);
+        return base64;
+    }
+    return String("-FAIL-");
+}
+
+/**
+ * read x byte from tcp or get timeout
+ * @param client WSclient_t *
+ * @param out  uint8_t * data buffer
+ * @param n size_t byte count
+ * @return true if ok
+ */
+bool WebSockets::readCb(WSclient_t * client, uint8_t * out, size_t n, WSreadWaitCb cb) {
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    if(!client->tcp || !client->tcp->connected()) {
+        return false;
+    }
+
+    client->tcp->readBytes(out, n, std::bind([](WSclient_t * client, bool ok, WSreadWaitCb cb) {
+        if(cb) {
+            cb(client, ok);
+        }
+    }, client, std::placeholders::_1, cb));
+
+#else
+    unsigned long t = millis();
+    size_t len;
+    DEBUG_WEBSOCKETS("[readCb] n: %d t: %d\n", n, t);
+    while(n > 0) {
+        if(client->tcp == NULL) {
+            DEBUG_WEBSOCKETS("[readCb] tcp is null!\n");
+            if(cb) {
+                cb(client, false);
+            }
+            return false;
+        }
+
+        if(!client->tcp->connected()) {
+            DEBUG_WEBSOCKETS("[readCb] not connected!\n");
+            if(cb) {
+                cb(client, false);
+            }
+            return false;
+        }
+
+        if((millis() - t) > WEBSOCKETS_TCP_TIMEOUT) {
+            DEBUG_WEBSOCKETS("[readCb] receive TIMEOUT! %d\n", (millis() - t));
+            if(cb) {
+                cb(client, false);
+            }
+            return false;
+        }
+
+        if(!client->tcp->available()) {
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+            delay(0);
+#endif
+            continue;
+        }
+
+        len = client->tcp->read((uint8_t*) out, n);
+        if(len) {
+            t = millis();
+            out += len;
+            n -= len;
+            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
+        } else {
+            //DEBUG_WEBSOCKETS("Receive %d left %d!\n", len, n);
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+    if(cb) {
+        cb(client, true);
+    }
+#endif
+    return true;
+}
+
diff --git a/libraries/arduinoWebSockets/src/WebSockets.h b/libraries/arduinoWebSockets/src/WebSockets.h
new file mode 100644
index 0000000..fbd8657
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/WebSockets.h
@@ -0,0 +1,225 @@
+/**
+ * @file WebSockets.h
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef WEBSOCKETS_H_
+#define WEBSOCKETS_H_
+
+#include <Arduino.h>
+
+//#define DEBUG_WEBSOCKETS(...) os_printf( __VA_ARGS__ )
+
+#ifndef DEBUG_WEBSOCKETS
+#define DEBUG_WEBSOCKETS(...)
+#define NODEBUG_WEBSOCKETS
+#endif
+
+#ifdef ESP8266
+#define WEBSOCKETS_MAX_DATA_SIZE  (15*1024)
+#define WEBSOCKETS_USE_BIG_MEM
+#else
+//atmega328p has only 2KB ram!
+#define WEBSOCKETS_MAX_DATA_SIZE  (1024)
+#endif
+
+#define WEBSOCKETS_TCP_TIMEOUT    (2000)
+
+#define NETWORK_ESP8266_ASYNC   (0)
+#define NETWORK_ESP8266         (1)
+#define NETWORK_W5100           (2)
+#define NETWORK_ENC28J60        (3)
+
+// max size of the WS Message Header
+#define WEBSOCKETS_MAX_HEADER_SIZE  (14)
+
+// select Network type based
+#if defined(ESP8266) || defined(ESP31B)
+#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266
+//#define WEBSOCKETS_NETWORK_TYPE NETWORK_ESP8266_ASYNC
+#else
+#define WEBSOCKETS_NETWORK_TYPE NETWORK_W5100
+#endif
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+
+// Note:
+//   No SSL/WSS support for client in Async mode
+//   TLS lib need a sync interface!
+
+#if !defined(ESP8266) && !defined(ESP31B)
+#error "network type ESP8266 ASYNC only possible on the ESP mcu!"
+#endif
+
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#else
+#include <ESP31BWiFi.h>
+#endif
+#include <ESPAsyncTCP.h>
+#include <ESPAsyncTCPbuffer.h>
+#define WEBSOCKETS_NETWORK_CLASS AsyncTCPbuffer
+#define WEBSOCKETS_NETWORK_SERVER_CLASS AsyncServer
+
+#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+
+#if !defined(ESP8266) && !defined(ESP31B)
+#error "network type ESP8266 only possible on the ESP mcu!"
+#endif
+
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#else
+#include <ESP31BWiFi.h>
+#endif
+#define WEBSOCKETS_NETWORK_CLASS WiFiClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS WiFiServer
+
+#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_W5100)
+
+#include <Ethernet.h>
+#include <SPI.h>
+#define WEBSOCKETS_NETWORK_CLASS EthernetClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS EthernetServer
+
+#elif (WEBSOCKETS_NETWORK_TYPE == NETWORK_ENC28J60)
+
+#include <UIPEthernet.h>
+#define WEBSOCKETS_NETWORK_CLASS UIPClient
+#define WEBSOCKETS_NETWORK_SERVER_CLASS UIPServer
+
+#else
+#error "no network type selected!"
+#endif
+
+
+typedef enum {
+    WSC_NOT_CONNECTED,
+    WSC_HEADER,
+    WSC_CONNECTED
+} WSclientsStatus_t;
+
+typedef enum {
+    WStype_ERROR,
+    WStype_DISCONNECTED,
+    WStype_CONNECTED,
+    WStype_TEXT,
+    WStype_BIN
+} WStype_t;
+
+typedef enum {
+    WSop_continuation = 0x00, ///< %x0 denotes a continuation frame
+    WSop_text = 0x01,         ///< %x1 denotes a text frame
+    WSop_binary = 0x02,       ///< %x2 denotes a binary frame
+                              ///< %x3-7 are reserved for further non-control frames
+    WSop_close = 0x08,        ///< %x8 denotes a connection close
+    WSop_ping = 0x09,         ///< %x9 denotes a ping
+    WSop_pong = 0x0A          ///< %xA denotes a pong
+                              ///< %xB-F are reserved for further control frames
+} WSopcode_t;
+
+typedef struct {
+
+        bool fin;
+        bool rsv1;
+        bool rsv2;
+        bool rsv3;
+
+        WSopcode_t opCode;
+        bool mask;
+
+        size_t payloadLen;
+
+        uint8_t * maskKey;
+} WSMessageHeader_t;
+
+typedef struct {
+        uint8_t num; ///< connection number
+
+        WSclientsStatus_t status;
+
+        WEBSOCKETS_NETWORK_CLASS * tcp;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        bool isSSL;             ///< run in ssl mode
+        WiFiClientSecure * ssl;
+#endif
+
+        String cUrl;        ///< http url
+        uint16_t cCode;     ///< http code
+
+        bool cIsUpgrade;    ///< Connection == Upgrade
+        bool cIsWebsocket;  ///< Upgrade == websocket
+
+        String cKey;        ///< client Sec-WebSocket-Key
+        String cAccept;     ///< client Sec-WebSocket-Accept
+        String cProtocol;   ///< client Sec-WebSocket-Protocol
+        String cExtensions; ///< client Sec-WebSocket-Extensions
+        uint16_t cVersion;  ///< client Sec-WebSocket-Version
+
+        uint8_t cWsRXsize;  ///< State of the RX
+        uint8_t cWsHeader[WEBSOCKETS_MAX_HEADER_SIZE]; ///< RX WS Message buffer
+        WSMessageHeader_t cWsHeaderDecode;
+
+        String base64Authorization; ///< Base64 encoded Auth request
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        String cHttpLine;   ///< HTTP header lines
+#endif
+
+} WSclient_t;
+
+
+
+class WebSockets {
+    protected:
+#ifdef __AVR__
+        typedef void (*WSreadWaitCb)(WSclient_t * client, bool ok);
+#else
+        typedef std::function<void(WSclient_t * client, bool ok)> WSreadWaitCb;
+#endif
+
+        virtual void clientDisconnect(WSclient_t * client);
+        virtual bool clientIsConnected(WSclient_t * client);
+
+        virtual void messageRecived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length);
+
+        void clientDisconnect(WSclient_t * client, uint16_t code, char * reason = NULL, size_t reasonLen = 0);
+        bool sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * payload = NULL, size_t length = 0, bool mask = false, bool fin = true, bool headerToPayload = false);
+
+        void headerDone(WSclient_t * client);
+
+        void handleWebsocket(WSclient_t * client);
+
+        bool handleWebsocketWaitFor(WSclient_t * client, size_t size);
+        void handleWebsocketCb(WSclient_t * client);
+        void handleWebsocketPayloadCb(WSclient_t * client, bool ok, uint8_t * payload);
+
+        String acceptKey(String & clientKey);
+        String base64_encode(uint8_t * data, size_t length);
+
+        bool readCb(WSclient_t * client, uint8_t *out, size_t n, WSreadWaitCb cb);
+
+
+};
+
+#endif /* WEBSOCKETS_H_ */
diff --git a/libraries/arduinoWebSockets/src/WebSocketsClient.cpp b/libraries/arduinoWebSockets/src/WebSocketsClient.cpp
new file mode 100644
index 0000000..5541694
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/WebSocketsClient.cpp
@@ -0,0 +1,625 @@
+/**
+ * @file WebSocketsClient.cpp
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "WebSockets.h"
+#include "WebSocketsClient.h"
+
+
+WebSocketsClient::WebSocketsClient() {
+    _cbEvent = NULL;
+    _client.num = 0;
+}
+
+WebSocketsClient::~WebSocketsClient() {
+    disconnect();
+}
+
+/**
+ * calles to init the Websockets server
+ */
+void WebSocketsClient::begin(const char *host, uint16_t port, const char * url, const char * protocol) {
+    _host = host;
+    _port = port;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _fingerprint = "";
+#endif
+
+    _client.num = 0;
+    _client.status = WSC_NOT_CONNECTED;
+    _client.tcp = NULL;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _client.isSSL = false;
+    _client.ssl = NULL;
+#endif
+    _client.cUrl = url;
+    _client.cCode = 0;
+    _client.cIsUpgrade = false;
+    _client.cIsWebsocket = true;
+    _client.cKey = "";
+    _client.cAccept = "";
+    _client.cProtocol = protocol;
+    _client.cExtensions = "";
+    _client.cVersion = 0;
+    _client.base64Authorization = "";
+
+#ifdef ESP8266
+    randomSeed(RANDOM_REG32);
+#else
+    // todo find better seed
+    randomSeed(millis());
+#endif
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    asyncConnect();
+#endif
+}
+
+void WebSocketsClient::begin(String host, uint16_t port, String url, String protocol) {
+    begin(host.c_str(), port, url.c_str(), protocol.c_str());
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+void WebSocketsClient::beginSSL(const char *host, uint16_t port, const char * url, const char * fingerprint, const char * protocol) {
+    begin(host, port, url, protocol);
+    _client.isSSL = true;
+    _fingerprint = fingerprint;
+}
+
+void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint, String protocol) {
+    beginSSL(host.c_str(), port, url.c_str(), fingerprint.c_str(), protocol.c_str());
+}
+#endif
+
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * called in arduino loop
+ */
+void WebSocketsClient::loop(void) {
+    if(!clientIsConnected(&_client)) {
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        if(_client.isSSL) {
+            DEBUG_WEBSOCKETS("[WS-Client] connect wss...\n");
+            if(_client.ssl) {
+                delete _client.ssl;
+                _client.ssl = NULL;
+                _client.tcp = NULL;
+            }
+            _client.ssl = new WiFiClientSecure();
+            _client.tcp = _client.ssl;
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client] connect ws...\n");
+            if(_client.tcp) {
+                delete _client.tcp;
+                _client.tcp = NULL;
+            }
+            _client.tcp = new WiFiClient();
+        }
+#else
+        _client.tcp = new WEBSOCKETS_NETWORK_CLASS();
+#endif
+
+        if(!_client.tcp) {
+            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
+            return;
+        }
+
+        if(_client.tcp->connect(_host.c_str(), _port)) {
+            connectedCb();
+        } else {
+            connectFailedCb();
+            delay(10); //some little delay to not flood the server
+        }
+    } else {
+        handleClientData();
+    }
+}
+#endif
+
+/**
+ * set callback function
+ * @param cbEvent WebSocketServerEvent
+ */
+void WebSocketsClient::onEvent(WebSocketClientEvent cbEvent) {
+    _cbEvent = cbEvent;
+}
+
+/**
+ * send text data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsClient::sendTXT(uint8_t * payload, size_t length, bool headerToPayload) {
+    if(length == 0) {
+        length = strlen((const char *) payload);
+    }
+    if(clientIsConnected(&_client)) {
+        return sendFrame(&_client, WSop_text, payload, length, true, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsClient::sendTXT(const uint8_t * payload, size_t length) {
+    return sendTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsClient::sendTXT(char * payload, size_t length, bool headerToPayload) {
+    return sendTXT((uint8_t *) payload, length, headerToPayload);
+}
+
+bool WebSocketsClient::sendTXT(const char * payload, size_t length) {
+    return sendTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsClient::sendTXT(String & payload) {
+    return sendTXT((uint8_t *) payload.c_str(), payload.length());
+}
+
+/**
+ * send binary data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsClient::sendBIN(uint8_t * payload, size_t length, bool headerToPayload) {
+    if(clientIsConnected(&_client)) {
+        return sendFrame(&_client, WSop_binary, payload, length, true, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsClient::sendBIN(const uint8_t * payload, size_t length) {
+    return sendBIN((uint8_t *) payload, length);
+}
+
+/**
+ * disconnect one client
+ * @param num uint8_t client id
+ */
+void WebSocketsClient::disconnect(void) {
+    if(clientIsConnected(&_client)) {
+        WebSockets::clientDisconnect(&_client, 1000);
+    }
+}
+
+/**
+ * set the Authorizatio for the http request
+ * @param user const char *
+ * @param password const char *
+ */
+void WebSocketsClient::setAuthorization(const char * user, const char * password) {
+    if(user && password) {
+        String auth = user;
+        auth += ":";
+        auth += password;
+        _client.base64Authorization = base64_encode((uint8_t *)auth.c_str(), auth.length());
+    }
+}
+
+/**
+ * set the Authorizatio for the http request
+ * @param auth const char * base64
+ */
+void WebSocketsClient::setAuthorization(const char * auth) {
+    if(auth) {
+        _client.base64Authorization = auth;
+    }
+}
+
+//#################################################################################
+//#################################################################################
+//#################################################################################
+
+/**
+ *
+ * @param client WSclient_t *  ptr to the client struct
+ * @param opcode WSopcode_t
+ * @param payload  uint8_t *
+ * @param lenght size_t
+ */
+void WebSocketsClient::messageRecived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t lenght) {
+    WStype_t type = WStype_ERROR;
+
+    switch(opcode) {
+        case WSop_text:
+            type = WStype_TEXT;
+            break;
+        case WSop_binary:
+            type = WStype_BIN;
+            break;
+    }
+
+    runCbEvent(type, payload, lenght);
+
+}
+
+/**
+ * Disconnect an client
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsClient::clientDisconnect(WSclient_t * client) {
+
+    bool event = false;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    if(client->isSSL && client->ssl) {
+        if(client->ssl->connected()) {
+            client->ssl->flush();
+            client->ssl->stop();
+        }
+        event = true;
+        delete client->ssl;
+        client->ssl = NULL;
+        client->tcp = NULL;
+    }
+#endif
+
+    if(client->tcp) {
+        if(client->tcp->connected()) {
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+            client->tcp->flush();
+#endif
+            client->tcp->stop();
+        }
+        event = true;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->status = WSC_NOT_CONNECTED;
+#else
+        delete client->tcp;
+#endif
+        client->tcp = NULL;
+    }
+
+    client->cCode = 0;
+    client->cKey = "";
+    client->cAccept = "";
+    client->cProtocol = "";
+    client->cVersion = 0;
+    client->cIsUpgrade = false;
+    client->cIsWebsocket = false;
+
+    client->status = WSC_NOT_CONNECTED;
+
+    DEBUG_WEBSOCKETS("[WS-Client] client disconnected.\n");
+    if(event) {
+        runCbEvent(WStype_DISCONNECTED, NULL, 0);
+    }
+}
+
+/**
+ * get client state
+ * @param client WSclient_t *  ptr to the client struct
+ * @return true = conneted
+ */
+bool WebSocketsClient::clientIsConnected(WSclient_t * client) {
+
+    if(!client->tcp) {
+        return false;
+    }
+
+    if(client->tcp->connected()) {
+        if(client->status != WSC_NOT_CONNECTED) {
+            return true;
+        }
+    } else {
+        // client lost
+        if(client->status != WSC_NOT_CONNECTED) {
+            DEBUG_WEBSOCKETS("[WS-Client] connection lost.\n");
+            // do cleanup
+            clientDisconnect(client);
+        }
+    }
+
+    if(client->tcp) {
+        // do cleanup
+        clientDisconnect(client);
+    }
+
+    return false;
+}
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * Handel incomming data from Client
+ */
+void WebSocketsClient::handleClientData(void) {
+    int len = _client.tcp->available();
+    if(len > 0) {
+        switch(_client.status) {
+            case WSC_HEADER:
+            {
+                String headerLine = _client.tcp->readStringUntil('\n');
+                handleHeader(&_client, &headerLine);
+            }
+                break;
+            case WSC_CONNECTED:
+                WebSockets::handleWebsocket(&_client);
+                break;
+            default:
+                WebSockets::clientDisconnect(&_client, 1002);
+                break;
+        }
+    }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    delay(0);
+#endif
+}
+#endif
+
+/**
+ * send the WebSocket header to Server
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsClient::sendHeader(WSclient_t * client) {
+
+    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header...\n");
+
+    uint8_t randomKey[16] = { 0 };
+
+    for(uint8_t i = 0; i < sizeof(randomKey); i++) {
+        randomKey[i] = random(0xFF);
+    }
+
+    client->cKey = base64_encode(&randomKey[0], 16);
+
+#ifndef NODEBUG_WEBSOCKETS
+    unsigned long start = micros();
+#endif
+
+    String handshake =  "GET " + client->cUrl + " HTTP/1.1\r\n"
+                        "Host: " + _host + "\r\n"
+                        "Upgrade: websocket\r\n"
+                        "Connection: Upgrade\r\n"
+                        "User-Agent: arduino-WebSocket-Client\r\n"
+                        "Sec-WebSocket-Version: 13\r\n"
+                        "Sec-WebSocket-Key: " + client->cKey + "\r\n";
+
+    if(client->cProtocol.length() > 0) {
+        handshake += "Sec-WebSocket-Protocol: " + client->cProtocol + "\r\n";
+    }
+
+    if(client->cExtensions.length() > 0) {
+        handshake += "Sec-WebSocket-Extensions: " + client->cExtensions + "\r\n";
+    }
+
+    if(client->base64Authorization.length() > 0) {
+        handshake += "Authorization: Basic " + client->base64Authorization + "\r\n";
+    }
+
+    handshake += "\r\n";
+
+    client->tcp->write(handshake.c_str(), handshake.length());
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+
+    DEBUG_WEBSOCKETS("[WS-Client][sendHeader] sending header... Done (%uus).\n", (micros() - start));
+
+}
+
+/**
+ * handle the WebSocket header reading
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsClient::handleHeader(WSclient_t * client, String * headerLine) {
+
+    headerLine->trim(); // remove \r
+
+    if(headerLine->length() > 0) {
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] RX: %s\n", headerLine->c_str());
+
+        if(headerLine->startsWith("HTTP/1.")) {
+            // "HTTP/1.1 101 Switching Protocols"
+            client->cCode = headerLine->substring(9, headerLine->indexOf(' ', 9)).toInt();
+        } else if(headerLine->indexOf(':')) {
+            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
+            String headerValue = headerLine->substring(headerLine->indexOf(':') + 2);
+
+            if(headerName.equalsIgnoreCase("Connection")) {
+                if(headerValue.indexOf("Upgrade") >= 0) {
+                    client->cIsUpgrade = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Upgrade")) {
+                if(headerValue.equalsIgnoreCase("websocket")) {
+                    client->cIsWebsocket = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Accept")) {
+                client->cAccept = headerValue;
+                client->cAccept.trim(); // see rfc6455
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Protocol")) {
+                client->cProtocol = headerValue;
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Extensions")) {
+                client->cExtensions = headerValue;
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Version")) {
+                client->cVersion = headerValue.toInt();
+            }
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
+        }
+
+        (*headerLine) = "";
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsClient::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+
+    } else {
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header read fin.\n");
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Client settings:\n");
+
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cURL: %s\n", client->cUrl.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cKey: %s\n", client->cKey.c_str());
+
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Server header:\n");
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cCode: %d\n", client->cCode);
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cIsUpgrade: %d\n", client->cIsUpgrade);
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cIsWebsocket: %d\n", client->cIsWebsocket);
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cAccept: %s\n", client->cAccept.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cProtocol: %s\n", client->cProtocol.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cExtensions: %s\n", client->cExtensions.c_str());
+        DEBUG_WEBSOCKETS("[WS-Client][handleHeader]  - cVersion: %d\n", client->cVersion);
+
+        bool ok = (client->cIsUpgrade && client->cIsWebsocket);
+
+        if(ok) {
+            switch(client->cCode) {
+                case 101:  ///< Switching Protocols
+
+                    break;
+                case 403: ///< Forbidden
+                    // todo handle login
+                default:   ///< Server dont unterstand requrst
+                    ok = false;
+                    DEBUG_WEBSOCKETS("[WS-Client][handleHeader] serverCode is not 101 (%d)\n", client->cCode);
+                    clientDisconnect(client);
+                    break;
+            }
+        }
+
+        if(ok) {
+
+            if(client->cAccept.length() == 0) {
+                ok = false;
+            } else {
+                // generate Sec-WebSocket-Accept key for check
+                String sKey = acceptKey(client->cKey);
+                if(sKey != client->cAccept) {
+                    DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Sec-WebSocket-Accept is wrong\n");
+                    ok = false;
+                }
+            }
+        }
+
+        if(ok) {
+
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Websocket connection init done.\n");
+            headerDone(client);
+
+
+            runCbEvent(WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
+
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] no Websocket connection close.\n");
+            client->tcp->write("This is a webSocket client!");
+            clientDisconnect(client);
+        }
+    }
+}
+
+void WebSocketsClient::connectedCb() {
+
+    DEBUG_WEBSOCKETS("[WS-Client] connected to %s:%u.\n", _host.c_str(), _port);
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    _client.tcp->onDisconnect(std::bind([](WebSocketsClient * c, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
+        DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
+        client->status = WSC_NOT_CONNECTED;
+        client->tcp = NULL;
+
+        // reconnect
+        c->asyncConnect();
+
+        return true;
+    }, this, std::placeholders::_1, &_client));
+#endif
+
+    _client.status = WSC_HEADER;
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+    // set Timeout for readBytesUntil and readStringUntil
+    _client.tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
+#endif
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _client.tcp->setNoDelay(true);
+
+    if(_client.isSSL && _fingerprint.length()) {
+        if(!_client.ssl->verify(_fingerprint.c_str(), _host.c_str())) {
+            DEBUG_WEBSOCKETS("[WS-Client] certificate mismatch\n");
+            WebSockets::clientDisconnect(&_client, 1000);
+            return;
+        }
+    }
+#endif
+
+    // send Header to Server
+    sendHeader(&_client);
+
+}
+
+
+void WebSocketsClient::connectFailedCb() {
+    DEBUG_WEBSOCKETS("[WS-Client] connection to %s:%u Faild\n", _host.c_str(), _port);
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+
+void WebSocketsClient::asyncConnect() {
+
+    DEBUG_WEBSOCKETS("[WS-Client] asyncConnect...\n");
+
+    AsyncClient * tcpclient = new AsyncClient();
+
+    if(!tcpclient) {
+        DEBUG_WEBSOCKETS("[WS-Client] creating AsyncClient class failed!\n");
+        return;
+    }
+
+    tcpclient->onDisconnect([](void *obj, AsyncClient* c) {
+        c->free();
+        delete c;
+    });
+
+    tcpclient->onConnect(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
+        ws->_client.tcp = new AsyncTCPbuffer(tcp);
+        if(!ws->_client.tcp) {
+            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!\n");
+            ws->connectFailedCb();
+            return;
+        }
+        ws->connectedCb();
+    }, this, std::placeholders::_2));
+
+    tcpclient->onError(std::bind([](WebSocketsClient * ws , AsyncClient * tcp) {
+        ws->connectFailedCb();
+
+        // reconnect
+        ws->asyncConnect();
+    }, this, std::placeholders::_2));
+
+    if(!tcpclient->connect(_host.c_str(), _port)) {
+        connectFailedCb();
+        delete tcpclient;
+    }
+
+}
+
+#endif
+
+
+
diff --git a/libraries/arduinoWebSockets/src/WebSocketsClient.h b/libraries/arduinoWebSockets/src/WebSocketsClient.h
new file mode 100644
index 0000000..1e9f3e7
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/WebSocketsClient.h
@@ -0,0 +1,118 @@
+/**
+ * @file WebSocketsClient.h
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef WEBSOCKETSCLIENT_H_
+#define WEBSOCKETSCLIENT_H_
+
+#include <Arduino.h>
+#include "WebSockets.h"
+
+class WebSocketsClient: private WebSockets {
+    public:
+#ifdef __AVR__
+        typedef void (*WebSocketClientEvent)(WStype_t type, uint8_t * payload, size_t length);
+#else
+        typedef std::function<void (WStype_t type, uint8_t * payload, size_t length)> WebSocketClientEvent;
+#endif
+
+
+        WebSocketsClient(void);
+        ~WebSocketsClient(void);
+
+        void begin(const char *host, uint16_t port, const char * url = "/", const char * protocol = "arduino");
+        void begin(String host, uint16_t port, String url = "/", String protocol = "arduino");
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        void beginSSL(const char *host, uint16_t port, const char * url = "/", const char * = "", const char * protocol = "arduino");
+        void beginSSL(String host, uint16_t port, String url = "/", String fingerprint = "", String protocol = "arduino");
+#endif
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void loop(void);
+#else
+        // Async interface not need a loop call
+        void loop(void) __attribute__ ((deprecated)) {}
+#endif
+
+        void onEvent(WebSocketClientEvent cbEvent);
+
+        bool sendTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(const uint8_t * payload, size_t length = 0);
+        bool sendTXT(char * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(const char * payload, size_t length = 0);
+        bool sendTXT(String & payload);
+
+        bool sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
+        bool sendBIN(const uint8_t * payload, size_t length);
+
+        void disconnect(void);
+
+        void setAuthorization(const char * user, const char * password);
+        void setAuthorization(const char * auth);
+
+    protected:
+        String _host;
+        uint16_t _port;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        String _fingerprint;
+#endif
+        WSclient_t _client;
+
+        WebSocketClientEvent _cbEvent;
+
+        void messageRecived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length);
+
+        void clientDisconnect(WSclient_t * client);
+        bool clientIsConnected(WSclient_t * client);
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void handleClientData(void);
+#endif
+
+        void sendHeader(WSclient_t * client);
+        void handleHeader(WSclient_t * client, String * headerLine);
+
+        void connectedCb();
+        void connectFailedCb();
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        void asyncConnect();
+#endif
+
+        /**
+         * called for sending a Event to the app
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
+        virtual void runCbEvent(WStype_t type, uint8_t * payload, size_t length) {
+            if(_cbEvent) {
+                _cbEvent(type, payload, length);
+            }
+        }
+
+};
+
+#endif /* WEBSOCKETSCLIENT_H_ */
diff --git a/libraries/arduinoWebSockets/src/WebSocketsServer.cpp b/libraries/arduinoWebSockets/src/WebSocketsServer.cpp
new file mode 100644
index 0000000..1b1cd12
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/WebSocketsServer.cpp
@@ -0,0 +1,712 @@
+/**
+ * @file WebSocketsServer.cpp
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include "WebSockets.h"
+#include "WebSocketsServer.h"
+
+WebSocketsServer::WebSocketsServer(uint16_t port, String origin, String protocol) {
+    _port = port;
+    _origin = origin;
+    _protocol = protocol;
+
+    _server = new WEBSOCKETS_NETWORK_SERVER_CLASS(port);
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    _server->onClient([](void *s, AsyncClient* c){
+        ((WebSocketsServer*)s)->newClient(new AsyncTCPbuffer(c));
+    }, this);
+#endif
+
+    _cbEvent = NULL;
+
+}
+
+
+WebSocketsServer::~WebSocketsServer() {
+    // disconnect all clients
+    disconnect();
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    _server->close();
+#else
+    // TODO how to close server?
+#endif
+
+}
+
+/**
+ * calles to init the Websockets server
+ */
+void WebSocketsServer::begin(void) {
+    WSclient_t * client;
+
+    // init client storage
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+
+        client->num = i;
+        client->status = WSC_NOT_CONNECTED;
+        client->tcp = NULL;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        client->isSSL = false;
+        client->ssl = NULL;
+#endif
+        client->cUrl = "";
+        client->cCode = 0;
+        client->cKey = "";
+        client->cProtocol = "";
+        client->cVersion = 0;
+        client->cIsUpgrade = false;
+        client->cIsWebsocket = false;
+
+        client->base64Authorization = "";
+
+        client->cWsRXsize = 0;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->cHttpLine = "";
+#endif
+    }
+
+#ifdef ESP8266
+    randomSeed(RANDOM_REG32);
+#else
+    // TODO find better seed
+    randomSeed(millis());
+#endif
+
+    _server->begin();
+
+    DEBUG_WEBSOCKETS("[WS-Server] Server Started.\n");
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * called in arduino loop
+ */
+void WebSocketsServer::loop(void) {
+    handleNewClients();
+    handleClientData();
+}
+#endif
+
+/**
+ * set callback function
+ * @param cbEvent WebSocketServerEvent
+ */
+void WebSocketsServer::onEvent(WebSocketServerEvent cbEvent) {
+    _cbEvent = cbEvent;
+}
+
+/**
+ * send text data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::sendTXT(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload) {
+    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
+        return false;
+    }
+    if(length == 0) {
+        length = strlen((const char *) payload);
+    }
+    WSclient_t * client = &_clients[num];
+    if(clientIsConnected(client)) {
+        return sendFrame(client, WSop_text, payload, length, false, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, const uint8_t * payload, size_t length) {
+    return sendTXT(num, (uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, char * payload, size_t length, bool headerToPayload) {
+    return sendTXT(num, (uint8_t *) payload, length, headerToPayload);
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, const char * payload, size_t length) {
+    return sendTXT(num, (uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::sendTXT(uint8_t num, String & payload) {
+    return sendTXT(num, (uint8_t *) payload.c_str(), payload.length());
+}
+
+/**
+ * send text data to client all
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::broadcastTXT(uint8_t * payload, size_t length, bool headerToPayload) {
+    WSclient_t * client;
+    bool ret = true;
+    if(length == 0) {
+        length = strlen((const char *) payload);
+    }
+
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            if(!sendFrame(client, WSop_text, payload, length, false, true, headerToPayload)) {
+                ret = false;
+            }
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+    return ret;
+}
+
+bool WebSocketsServer::broadcastTXT(const uint8_t * payload, size_t length) {
+    return broadcastTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::broadcastTXT(char * payload, size_t length, bool headerToPayload) {
+    return broadcastTXT((uint8_t *) payload, length, headerToPayload);
+}
+
+bool WebSocketsServer::broadcastTXT(const char * payload, size_t length) {
+    return broadcastTXT((uint8_t *) payload, length);
+}
+
+bool WebSocketsServer::broadcastTXT(String & payload) {
+    return broadcastTXT((uint8_t *) payload.c_str(), payload.length());
+}
+
+/**
+ * send binary data to client
+ * @param num uint8_t client id
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload) {
+    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
+        return false;
+    }
+    WSclient_t * client = &_clients[num];
+    if(clientIsConnected(client)) {
+        return sendFrame(client, WSop_binary, payload, length, false, true, headerToPayload);
+    }
+    return false;
+}
+
+bool WebSocketsServer::sendBIN(uint8_t num, const uint8_t * payload, size_t length) {
+    return sendBIN(num, (uint8_t *) payload, length);
+}
+
+/**
+ * send binary data to client all
+ * @param payload uint8_t *
+ * @param length size_t
+ * @param headerToPayload bool  (see sendFrame for more details)
+ * @return true if ok
+ */
+bool WebSocketsServer::broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload) {
+    WSclient_t * client;
+    bool ret = true;
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            if(!sendFrame(client, WSop_binary, payload, length, false, true, headerToPayload)) {
+                ret = false;
+            }
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+    return ret;
+}
+
+bool WebSocketsServer::broadcastBIN(const uint8_t * payload, size_t length) {
+    return broadcastBIN((uint8_t *) payload, length);
+}
+
+/**
+ * disconnect all clients
+ */
+void WebSocketsServer::disconnect(void) {
+    WSclient_t * client;
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            WebSockets::clientDisconnect(client, 1000);
+        }
+    }
+}
+
+/**
+ * disconnect one client
+ * @param num uint8_t client id
+ */
+void WebSocketsServer::disconnect(uint8_t num) {
+    if(num >= WEBSOCKETS_SERVER_CLIENT_MAX) {
+        return;
+    }
+    WSclient_t * client = &_clients[num];
+    if(clientIsConnected(client)) {
+        WebSockets::clientDisconnect(client, 1000);
+    }
+}
+
+
+
+/**
+ * set the Authorizatio for the http request
+ * @param user const char *
+ * @param password const char *
+ */
+void WebSocketsServer::setAuthorization(const char * user, const char * password) {
+    if(user && password) {
+        String auth = user;
+        auth += ":";
+        auth += password;
+        _base64Authorization = base64_encode((uint8_t *)auth.c_str(), auth.length());
+    }
+}
+
+/**
+ * set the Authorizatio for the http request
+ * @param auth const char * base64
+ */
+void WebSocketsServer::setAuthorization(const char * auth) {
+    if(auth) {
+        _base64Authorization = auth;
+    }
+}
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+/**
+ * get an IP for a client
+ * @param num uint8_t client id
+ * @return IPAddress
+ */
+IPAddress WebSocketsServer::remoteIP(uint8_t num) {
+    if(num < WEBSOCKETS_SERVER_CLIENT_MAX) {
+        WSclient_t * client = &_clients[num];
+        if(clientIsConnected(client)) {
+            return client->tcp->remoteIP();
+        }
+    }
+
+    return IPAddress();
+}
+#endif
+
+//#################################################################################
+//#################################################################################
+//#################################################################################
+
+/**
+ * handle new client connection
+ * @param client
+ */
+bool WebSocketsServer::newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient) {
+    WSclient_t * client;
+    // search free list entry for client
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+
+        // state is not connected or tcp connection is lost
+        if(!clientIsConnected(client)) {
+
+            client->tcp = TCPclient;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+            client->isSSL = false;
+            client->tcp->setNoDelay(true);
+#endif
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+            // set Timeout for readBytesUntil and readStringUntil
+            client->tcp->setTimeout(WEBSOCKETS_TCP_TIMEOUT);
+#endif
+            client->status = WSC_HEADER;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+            IPAddress ip = client->tcp->remoteIP();
+            DEBUG_WEBSOCKETS("[WS-Server][%d] new client from %d.%d.%d.%d\n", client->num, ip[0], ip[1], ip[2], ip[3]);
+#else
+            DEBUG_WEBSOCKETS("[WS-Server][%d] new client\n", client->num);
+#endif
+
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+            client->tcp->onDisconnect(std::bind([](WebSocketsServer * server, AsyncTCPbuffer * obj, WSclient_t * client) -> bool {
+                DEBUG_WEBSOCKETS("[WS-Server][%d] Disconnect client\n", client->num);
+
+                AsyncTCPbuffer ** sl = &server->_clients[client->num].tcp;
+                if(*sl == obj) {
+                    client->status = WSC_NOT_CONNECTED;
+                    *sl = NULL;
+                }
+                return true;
+            },  this, std::placeholders::_1, client));
+
+
+            client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+
+            return true;
+            break;
+        }
+    }
+    return false;
+}
+
+/**
+ *
+ * @param client WSclient_t *  ptr to the client struct
+ * @param opcode WSopcode_t
+ * @param payload  uint8_t *
+ * @param lenght size_t
+ */
+void WebSocketsServer::messageRecived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t lenght) {
+    WStype_t type = WStype_ERROR;
+
+    switch(opcode) {
+        case WSop_text:
+            type = WStype_TEXT;
+            break;
+        case WSop_binary:
+            type = WStype_BIN;
+            break;
+    }
+
+    runCbEvent(client->num, type, payload, lenght);
+
+}
+
+/**
+ * Disconnect an client
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsServer::clientDisconnect(WSclient_t * client) {
+
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    if(client->isSSL && client->ssl) {
+        if(client->ssl->connected()) {
+            client->ssl->flush();
+            client->ssl->stop();
+        }
+        delete client->ssl;
+        client->ssl = NULL;
+        client->tcp = NULL;
+    }
+#endif
+
+    if(client->tcp) {
+        if(client->tcp->connected()) {
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+            client->tcp->flush();
+#endif
+            client->tcp->stop();
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->status = WSC_NOT_CONNECTED;
+#else
+        delete client->tcp;
+#endif
+        client->tcp = NULL;
+    }
+
+    client->cUrl = "";
+    client->cKey = "";
+    client->cProtocol = "";
+    client->cVersion = 0;
+    client->cIsUpgrade = false;
+    client->cIsWebsocket = false;
+
+    client->cWsRXsize = 0;
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+    client->cHttpLine = "";
+#endif
+
+    client->status = WSC_NOT_CONNECTED;
+
+    DEBUG_WEBSOCKETS("[WS-Server][%d] client disconnected.\n", client->num);
+
+    runCbEvent(client->num, WStype_DISCONNECTED, NULL, 0);
+
+}
+
+/**
+ * get client state
+ * @param client WSclient_t *  ptr to the client struct
+ * @return true = conneted
+ */
+bool WebSocketsServer::clientIsConnected(WSclient_t * client) {
+
+    if(!client->tcp) {
+        return false;
+    }
+
+    if(client->tcp->connected()) {
+        if(client->status != WSC_NOT_CONNECTED) {
+            return true;
+        }
+    } else {
+        // client lost
+        if(client->status != WSC_NOT_CONNECTED) {
+            DEBUG_WEBSOCKETS("[WS-Server][%d] client connection lost.\n", client->num);
+            // do cleanup
+            clientDisconnect(client);
+        }
+    }
+
+    if(client->tcp) {
+        // do cleanup
+        DEBUG_WEBSOCKETS("[WS-Server][%d] client list cleanup.\n", client->num);
+        clientDisconnect(client);
+    }
+
+    return false;
+}
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+/**
+ * Handle incomming Connection Request
+ */
+void WebSocketsServer::handleNewClients(void) {
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+    while(_server->hasClient()) {
+#endif
+        bool ok = false;
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        // store new connection
+        WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
+#else
+        WEBSOCKETS_NETWORK_CLASS * tcpClient = new WEBSOCKETS_NETWORK_CLASS(_server->available());
+#endif
+
+        if(!tcpClient) {
+            DEBUG_WEBSOCKETS("[WS-Client] creating Network class failed!");
+            return;
+        }
+
+        ok = newClient(tcpClient);
+
+        if(!ok) {
+            // no free space to handle client
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+            IPAddress ip = tcpClient->remoteIP();
+            DEBUG_WEBSOCKETS("[WS-Server] no free space new client from %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
+#else
+            DEBUG_WEBSOCKETS("[WS-Server] no free space new client\n");
+#endif
+            tcpClient->stop();
+        }
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+    }
+#endif
+
+}
+
+
+/**
+ * Handel incomming data from Client
+ */
+void WebSocketsServer::handleClientData(void) {
+
+    WSclient_t * client;
+    for(uint8_t i = 0; i < WEBSOCKETS_SERVER_CLIENT_MAX; i++) {
+        client = &_clients[i];
+        if(clientIsConnected(client)) {
+            int len = client->tcp->available();
+            if(len > 0) {
+                //DEBUG_WEBSOCKETS("[WS-Server][%d][handleClientData] len: %d\n", client->num, len);
+                switch(client->status) {
+                    case WSC_HEADER:
+                    {
+                        String headerLine = client->tcp->readStringUntil('\n');
+                        handleHeader(client, &headerLine);
+                    }
+                        break;
+                    case WSC_CONNECTED:
+                        WebSockets::handleWebsocket(client);
+                        break;
+                    default:
+                        WebSockets::clientDisconnect(client, 1002);
+                        break;
+                }
+            }
+        }
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
+        delay(0);
+#endif
+    }
+}
+#endif
+
+
+/**
+ * handle the WebSocket header reading
+ * @param client WSclient_t *  ptr to the client struct
+ */
+void WebSocketsServer::handleHeader(WSclient_t * client, String * headerLine) {
+
+    headerLine->trim(); // remove \r
+
+    if(headerLine->length() > 0) {
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] RX: %s\n", client->num, headerLine->c_str());
+
+        // websocket request starts allways with GET see rfc6455
+        if(headerLine->startsWith("GET ")) {
+            // cut URL out
+            client->cUrl = headerLine->substring(4, headerLine->indexOf(' ', 4));
+        } else if(headerLine->indexOf(':')) {
+            String headerName = headerLine->substring(0, headerLine->indexOf(':'));
+            String headerValue = headerLine->substring(headerLine->indexOf(':') + 2);
+
+            if(headerName.equalsIgnoreCase("Connection")) {
+                if(headerValue.indexOf("Upgrade") >= 0) {
+                    client->cIsUpgrade = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Upgrade")) {
+                if(headerValue.equalsIgnoreCase("websocket")) {
+                    client->cIsWebsocket = true;
+                }
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Version")) {
+                client->cVersion = headerValue.toInt();
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Key")) {
+                client->cKey = headerValue;
+                client->cKey.trim(); // see rfc6455
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Protocol")) {
+                client->cProtocol = headerValue;
+            } else if(headerName.equalsIgnoreCase("Sec-WebSocket-Extensions")) {
+                client->cExtensions = headerValue;
+            } else if(headerName.equalsIgnoreCase("Authorization")) {
+                client->base64Authorization = headerValue;
+            }
+        } else {
+            DEBUG_WEBSOCKETS("[WS-Client][handleHeader] Header error (%s)\n", headerLine->c_str());
+        }
+
+        (*headerLine) = "";
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        client->tcp->readStringUntil('\n', &(client->cHttpLine), std::bind(&WebSocketsServer::handleHeader, this, client, &(client->cHttpLine)));
+#endif
+    } else {
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Header read fin.\n", client->num);
+
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cURL: %s\n", client->num, client->cUrl.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cIsUpgrade: %d\n", client->num, client->cIsUpgrade);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cIsWebsocket: %d\n", client->num, client->cIsWebsocket);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cKey: %s\n", client->num, client->cKey.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cProtocol: %s\n", client->num, client->cProtocol.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cExtensions: %s\n", client->num, client->cExtensions.c_str());
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - cVersion: %d\n", client->num, client->cVersion);
+        DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - base64Authorization: %s\n", client->num, client->base64Authorization.c_str());
+
+        bool ok = (client->cIsUpgrade && client->cIsWebsocket);
+
+        if(ok) {
+            if(client->cUrl.length() == 0) {
+                ok = false;
+            }
+            if(client->cKey.length() == 0) {
+                ok = false;
+            }
+            if(client->cVersion != 13) {
+                ok = false;
+            }
+        }
+
+        if(_base64Authorization.length() > 0) {
+            if(client->base64Authorization.length() > 0) {
+                String auth = "Basic ";
+                auth += _base64Authorization;
+                if(auth != client->base64Authorization) {
+                    DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] HTTP Authorization failed!\n", client->num);
+                    handleAuthorizationFailed(client);
+                    return;
+                }
+            } else {
+                ok = false;
+            }
+        }
+
+        if(ok) {
+
+            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incoming.\n", client->num);
+
+            // generate Sec-WebSocket-Accept key
+            String sKey = acceptKey(client->cKey);
+
+            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader]  - sKey: %s\n", client->num, sKey.c_str());
+
+            client->status = WSC_CONNECTED;
+
+            client->tcp->write("HTTP/1.1 101 Switching Protocols\r\n"
+                    "Server: arduino-WebSocketsServer\r\n"
+                    "Upgrade: websocket\r\n"
+                    "Connection: Upgrade\r\n"
+                    "Sec-WebSocket-Version: 13\r\n"
+                    "Sec-WebSocket-Accept: ");
+            client->tcp->write(sKey.c_str(), sKey.length());
+
+            if(_origin.length() > 0) {
+                String origin = "\r\nAccess-Control-Allow-Origin: ";
+                origin += _origin;
+                origin += "\r\n";
+                client->tcp->write(origin.c_str(), origin.length());
+            }
+
+            if(client->cProtocol.length() > 0) {
+                String protocol = "\r\nSec-WebSocket-Protocol: ";
+                protocol += _protocol;
+                protocol += "\r\n";
+                client->tcp->write(protocol.c_str(), protocol.length());
+            } else {
+                client->tcp->write("\r\n");
+            }
+
+            // header end
+            client->tcp->write("\r\n");
+
+            headerDone(client);
+
+            // send ping
+            WebSockets::sendFrame(client, WSop_ping);
+
+            runCbEvent(client->num, WStype_CONNECTED, (uint8_t *) client->cUrl.c_str(), client->cUrl.length());
+
+        } else {
+            handleNonWebsocketConnection(client);
+        }
+    }
+}
+
+
+
diff --git a/libraries/arduinoWebSockets/src/WebSocketsServer.h b/libraries/arduinoWebSockets/src/WebSocketsServer.h
new file mode 100644
index 0000000..10fdfdb
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/WebSocketsServer.h
@@ -0,0 +1,169 @@
+/**
+ * @file WebSocketsServer.h
+ * @date 20.05.2015
+ * @author Markus Sattler
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the WebSockets for Arduino.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef WEBSOCKETSSERVER_H_
+#define WEBSOCKETSSERVER_H_
+
+#include <Arduino.h>
+#include "WebSockets.h"
+
+#define WEBSOCKETS_SERVER_CLIENT_MAX  (5)
+
+
+
+
+class WebSocketsServer: private WebSockets {
+public:
+
+#ifdef __AVR__
+        typedef void (*WebSocketServerEvent)(uint8_t num, WStype_t type, uint8_t * payload, size_t length);
+#else
+        typedef std::function<void (uint8_t num, WStype_t type, uint8_t * payload, size_t length)> WebSocketServerEvent;
+#endif
+
+        WebSocketsServer(uint16_t port, String origin = "", String protocol = "arduino");
+        ~WebSocketsServer(void);
+
+        void begin(void);
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void loop(void);
+#else
+        // Async interface not need a loop call
+        void loop(void) __attribute__ ((deprecated)) {}
+#endif
+
+        void onEvent(WebSocketServerEvent cbEvent);
+
+
+        bool sendTXT(uint8_t num, uint8_t * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(uint8_t num, const uint8_t * payload, size_t length = 0);
+        bool sendTXT(uint8_t num, char * payload, size_t length = 0, bool headerToPayload = false);
+        bool sendTXT(uint8_t num, const char * payload, size_t length = 0);
+        bool sendTXT(uint8_t num, String & payload);
+
+        bool broadcastTXT(uint8_t * payload, size_t length = 0, bool headerToPayload = false);
+        bool broadcastTXT(const uint8_t * payload, size_t length = 0);
+        bool broadcastTXT(char * payload, size_t length = 0, bool headerToPayload = false);
+        bool broadcastTXT(const char * payload, size_t length = 0);
+        bool broadcastTXT(String & payload);
+
+        bool sendBIN(uint8_t num, uint8_t * payload, size_t length, bool headerToPayload = false);
+        bool sendBIN(uint8_t num, const uint8_t * payload, size_t length);
+
+        bool broadcastBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
+        bool broadcastBIN(const uint8_t * payload, size_t length);
+
+        void disconnect(void);
+        void disconnect(uint8_t num);
+
+        void setAuthorization(const char * user, const char * password);
+        void setAuthorization(const char * auth);
+
+#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266) || (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266_ASYNC)
+        IPAddress remoteIP(uint8_t num);
+#endif
+
+protected:
+        uint16_t _port;
+        String _origin;
+        String _protocol;
+        String _base64Authorization; ///< Base64 encoded Auth request
+
+        WEBSOCKETS_NETWORK_SERVER_CLASS * _server;
+
+        WSclient_t _clients[WEBSOCKETS_SERVER_CLIENT_MAX];
+
+        WebSocketServerEvent _cbEvent;
+
+        bool newClient(WEBSOCKETS_NETWORK_CLASS * TCPclient);
+
+        void messageRecived(WSclient_t * client, WSopcode_t opcode, uint8_t * payload, size_t length);
+
+        void clientDisconnect(WSclient_t * client);
+        bool clientIsConnected(WSclient_t * client);
+
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
+        void handleNewClients(void);
+        void handleClientData(void);
+#endif
+
+        void handleHeader(WSclient_t * client, String * headerLine);
+
+
+        /**
+         * called if a non Websocket connection is coming in.
+         * Note: can be override
+         * @param client WSclient_t *  ptr to the client struct
+         */
+        virtual void handleNonWebsocketConnection(WSclient_t * client) {
+            DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] no Websocket connection close.\n", client->num);
+            client->tcp->write("HTTP/1.1 400 Bad Request\r\n"
+                    "Server: arduino-WebSocket-Server\r\n"
+                    "Content-Type: text/plain\r\n"
+                    "Content-Length: 32\r\n"
+                    "Connection: close\r\n"
+                    "Sec-WebSocket-Version: 13\r\n"
+                    "\r\n"
+                    "This is a Websocket server only!");
+            clientDisconnect(client);
+        }
+
+        /**
+         * called if a non Authorization connection is coming in.
+         * Note: can be override
+         * @param client WSclient_t *  ptr to the client struct
+         */
+        virtual void handleAuthorizationFailed(WSclient_t *client) {
+
+            client->tcp->write("HTTP/1.1 401 Unauthorized\r\n"
+                    "Server: arduino-WebSocket-Server\r\n"
+                    "Content-Type: text/plain\r\n"
+                    "Content-Length: 45\r\n"
+                    "Connection: close\r\n"
+                    "Sec-WebSocket-Version: 13\r\n"
+                    "WWW-Authenticate: Basic realm=\"WebSocket Server\""
+                    "\r\n"
+                    "This Websocket server requires Authorization!");
+            clientDisconnect(client);
+        }
+
+        /**
+         * called for sending a Event to the app
+         * @param num uint8_t
+         * @param type WStype_t
+         * @param payload uint8_t *
+         * @param length size_t
+         */
+        virtual void runCbEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t length) {
+            if(_cbEvent) {
+                _cbEvent(num, type, payload, length);
+            }
+        }
+
+};
+
+
+
+#endif /* WEBSOCKETSSERVER_H_ */
diff --git a/libraries/arduinoWebSockets/src/libb64/AUTHORS b/libraries/arduinoWebSockets/src/libb64/AUTHORS
new file mode 100644
index 0000000..af68737
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libb64/AUTHORS
@@ -0,0 +1,7 @@
+libb64: Base64 Encoding/Decoding Routines
+======================================
+
+Authors:
+-------
+
+Chris Venter	chris.venter@gmail.com	http://rocketpod.blogspot.com
diff --git a/libraries/arduinoWebSockets/src/libb64/LICENSE b/libraries/arduinoWebSockets/src/libb64/LICENSE
new file mode 100644
index 0000000..a6b5606
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libb64/LICENSE
@@ -0,0 +1,29 @@
+Copyright-Only Dedication (based on United States law) 
+or Public Domain Certification
+
+The person or persons who have associated work with this document (the
+"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
+his knowledge, the work of authorship identified is in the public domain of the
+country from which the work is published, or (b) hereby dedicates whatever
+copyright the dedicators holds in the work of authorship identified below (the
+"Work") to the public domain. A certifier, moreover, dedicates any copyright
+interest he may have in the associated work, and for these purposes, is
+described as a "dedicator" below.
+
+A certifier has taken reasonable steps to verify the copyright status of this
+work. Certifier recognizes that his good faith efforts may not shield him from
+liability if in fact the work certified is not in the public domain.
+
+Dedicator makes this dedication for the benefit of the public at large and to
+the detriment of the Dedicator's heirs and successors. Dedicator intends this
+dedication to be an overt act of relinquishment in perpetuity of all present
+and future rights under copyright law, whether vested or contingent, in the
+Work. Dedicator understands that such relinquishment of all rights includes
+the relinquishment of all rights to enforce (by lawsuit or otherwise) those
+copyrights in the Work.
+
+Dedicator recognizes that, once placed in the public domain, the Work may be
+freely reproduced, distributed, transmitted, used, modified, built upon, or
+otherwise exploited by anyone for any purpose, commercial or non-commercial,
+and in any way, including by methods that have not yet been invented or
+conceived.
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/src/libb64/cdecode.c b/libraries/arduinoWebSockets/src/libb64/cdecode.c
new file mode 100644
index 0000000..0d86d0e
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libb64/cdecode.c
@@ -0,0 +1,94 @@
+/*
+cdecoder.c - c source to a base64 decoding algorithm implementation
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+#ifndef CORE_HAS_LIBB64
+#include "cdecode_inc.h"
+
+int base64_decode_value(char value_in)
+{
+	static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
+	static const char decoding_size = sizeof(decoding);
+	value_in -= 43;
+	if (value_in < 0 || value_in > decoding_size) return -1;
+	return decoding[(int)value_in];
+}
+
+void base64_init_decodestate(base64_decodestate* state_in)
+{
+	state_in->step = step_a;
+	state_in->plainchar = 0;
+}
+
+int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in)
+{
+	const char* codechar = code_in;
+	char* plainchar = plaintext_out;
+	char fragment;
+	
+	*plainchar = state_in->plainchar;
+	
+	switch (state_in->step)
+	{
+		while (1)
+		{
+	case step_a:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_a;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar    = (fragment & 0x03f) << 2;
+	case step_b:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_b;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar++ |= (fragment & 0x030) >> 4;
+			*plainchar    = (fragment & 0x00f) << 4;
+	case step_c:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_c;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar++ |= (fragment & 0x03c) >> 2;
+			*plainchar    = (fragment & 0x003) << 6;
+	case step_d:
+			do {
+				if (codechar == code_in+length_in)
+				{
+					state_in->step = step_d;
+					state_in->plainchar = *plainchar;
+					return plainchar - plaintext_out;
+				}
+				fragment = (char)base64_decode_value(*codechar++);
+			} while (fragment < 0);
+			*plainchar++   |= (fragment & 0x03f);
+		}
+	}
+	/* control should not reach here */
+	return plainchar - plaintext_out;
+}
+
+#endif
diff --git a/libraries/arduinoWebSockets/src/libb64/cdecode_inc.h b/libraries/arduinoWebSockets/src/libb64/cdecode_inc.h
new file mode 100644
index 0000000..d0d7f48
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libb64/cdecode_inc.h
@@ -0,0 +1,28 @@
+/*
+cdecode.h - c header for a base64 decoding algorithm
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifndef BASE64_CDECODE_H
+#define BASE64_CDECODE_H
+
+typedef enum
+{
+	step_a, step_b, step_c, step_d
+} base64_decodestep;
+
+typedef struct
+{
+	base64_decodestep step;
+	char plainchar;
+} base64_decodestate;
+
+void base64_init_decodestate(base64_decodestate* state_in);
+
+int base64_decode_value(char value_in);
+
+int base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in);
+
+#endif /* BASE64_CDECODE_H */
diff --git a/libraries/arduinoWebSockets/src/libb64/cencode.c b/libraries/arduinoWebSockets/src/libb64/cencode.c
new file mode 100644
index 0000000..7367135
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libb64/cencode.c
@@ -0,0 +1,115 @@
+/*
+cencoder.c - c source to a base64 encoding algorithm implementation
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifdef ESP8266
+#include <core_esp8266_features.h>
+#endif
+
+#ifndef CORE_HAS_LIBB64
+#include "cencode_inc.h"
+
+const int CHARS_PER_LINE = 72;
+
+void base64_init_encodestate(base64_encodestate* state_in)
+{
+	state_in->step = step_A;
+	state_in->result = 0;
+	state_in->stepcount = 0;
+}
+
+char base64_encode_value(char value_in)
+{
+	static const char* encoding = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	if (value_in > 63) return '=';
+	return encoding[(int)value_in];
+}
+
+int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in)
+{
+	const char* plainchar = plaintext_in;
+	const char* const plaintextend = plaintext_in + length_in;
+	char* codechar = code_out;
+	char result;
+	char fragment;
+	
+	result = state_in->result;
+	
+	switch (state_in->step)
+	{
+		while (1)
+		{
+	case step_A:
+			if (plainchar == plaintextend)
+			{
+				state_in->result = result;
+				state_in->step = step_A;
+				return codechar - code_out;
+			}
+			fragment = *plainchar++;
+			result = (fragment & 0x0fc) >> 2;
+			*codechar++ = base64_encode_value(result);
+			result = (fragment & 0x003) << 4;
+	case step_B:
+			if (plainchar == plaintextend)
+			{
+				state_in->result = result;
+				state_in->step = step_B;
+				return codechar - code_out;
+			}
+			fragment = *plainchar++;
+			result |= (fragment & 0x0f0) >> 4;
+			*codechar++ = base64_encode_value(result);
+			result = (fragment & 0x00f) << 2;
+	case step_C:
+			if (plainchar == plaintextend)
+			{
+				state_in->result = result;
+				state_in->step = step_C;
+				return codechar - code_out;
+			}
+			fragment = *plainchar++;
+			result |= (fragment & 0x0c0) >> 6;
+			*codechar++ = base64_encode_value(result);
+			result  = (fragment & 0x03f) >> 0;
+			*codechar++ = base64_encode_value(result);
+			
+			++(state_in->stepcount);
+			if (state_in->stepcount == CHARS_PER_LINE/4)
+			{
+				*codechar++ = '\n';
+				state_in->stepcount = 0;
+			}
+		}
+	}
+	/* control should not reach here */
+	return codechar - code_out;
+}
+
+int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
+{
+	char* codechar = code_out;
+	
+	switch (state_in->step)
+	{
+	case step_B:
+		*codechar++ = base64_encode_value(state_in->result);
+		*codechar++ = '=';
+		*codechar++ = '=';
+		break;
+	case step_C:
+		*codechar++ = base64_encode_value(state_in->result);
+		*codechar++ = '=';
+		break;
+	case step_A:
+		break;
+	}
+	*codechar++ = 0x00;
+	
+	return codechar - code_out;
+}
+
+#endif
diff --git a/libraries/arduinoWebSockets/src/libb64/cencode_inc.h b/libraries/arduinoWebSockets/src/libb64/cencode_inc.h
new file mode 100644
index 0000000..c1e3464
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libb64/cencode_inc.h
@@ -0,0 +1,31 @@
+/*
+cencode.h - c header for a base64 encoding algorithm
+
+This is part of the libb64 project, and has been placed in the public domain.
+For details, see http://sourceforge.net/projects/libb64
+*/
+
+#ifndef BASE64_CENCODE_H
+#define BASE64_CENCODE_H
+
+typedef enum
+{
+	step_A, step_B, step_C
+} base64_encodestep;
+
+typedef struct
+{
+	base64_encodestep step;
+	char result;
+	int stepcount;
+} base64_encodestate;
+
+void base64_init_encodestate(base64_encodestate* state_in);
+
+char base64_encode_value(char value_in);
+
+int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in);
+
+int base64_encode_blockend(char* code_out, base64_encodestate* state_in);
+
+#endif /* BASE64_CENCODE_H */
diff --git a/libraries/arduinoWebSockets/src/libsha1/libsha1.c b/libraries/arduinoWebSockets/src/libsha1/libsha1.c
new file mode 100644
index 0000000..e6c1f3a
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libsha1/libsha1.c
@@ -0,0 +1,202 @@
+/* from valgrind tests */
+
+/* ================ sha1.c ================ */
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define LITTLE_ENDIAN * This should be #define'd already, if true. */
+/* #define SHA1HANDSOFF * Copies data before messing with it. */
+
+#ifndef ESP8266
+
+#define SHA1HANDSOFF
+
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "libsha1.h"
+
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#elif BYTE_ORDER == BIG_ENDIAN
+#define blk0(i) block->l[i]
+#else
+#error "Endianness not defined!"
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+
+void SHA1Transform(uint32_t state[5], const unsigned char buffer[64])
+{
+    uint32_t a, b, c, d, e;
+    typedef union {
+        unsigned char c[64];
+        uint32_t l[16];
+    } CHAR64LONG16;
+#ifdef SHA1HANDSOFF
+    CHAR64LONG16 block[1];  /* use array to appear as a pointer */
+    memcpy(block, buffer, 64);
+#else
+    /* The following had better never be used because it causes the
+     * pointer-to-const buffer to be cast into a pointer to non-const.
+     * And the result is written through.  I threw a "const" in, hoping
+     * this will cause a diagnostic.
+     */
+    CHAR64LONG16* block = (const CHAR64LONG16*)buffer;
+#endif
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+#ifdef SHA1HANDSOFF
+    memset(block, '\0', sizeof(block));
+#endif
+}
+
+
+/* SHA1Init - Initialize new context */
+
+void SHA1Init(SHA1_CTX* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+
+void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len)
+{
+    uint32_t i, j;
+
+    j = context->count[0];
+    if ((context->count[0] += len << 3) < j)
+        context->count[1]++;
+    context->count[1] += (len>>29);
+    j = (j >> 3) & 63;
+    if ((j + len) > 63) {
+        memcpy(&context->buffer[j], data, (i = 64-j));
+        SHA1Transform(context->state, context->buffer);
+        for ( ; i + 63 < len; i += 64) {
+            SHA1Transform(context->state, &data[i]);
+        }
+        j = 0;
+    }
+    else i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+}
+
+
+/* Add padding and return the message digest. */
+
+void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
+{
+    unsigned i;
+    unsigned char finalcount[8];
+    unsigned char c;
+
+#if 0	/* untested "improvement" by DHR */
+    /* Convert context->count to a sequence of bytes
+     * in finalcount.  Second element first, but
+     * big-endian order within element.
+     * But we do it all backwards.
+     */
+    unsigned char *fcp = &finalcount[8];
+
+    for (i = 0; i < 2; i++)
+       {
+        uint32_t t = context->count[i];
+        int j;
+
+        for (j = 0; j < 4; t >>= 8, j++)
+	          *--fcp = (unsigned char) t;
+    }
+#else
+    for (i = 0; i < 8; i++) {
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+#endif
+    c = 0200;
+    SHA1Update(context, &c, 1);
+    while ((context->count[0] & 504) != 448) {
+	c = 0000;
+        SHA1Update(context, &c, 1);
+    }
+    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
+    for (i = 0; i < 20; i++) {
+        digest[i] = (unsigned char)
+         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+    /* Wipe variables */
+    memset(context, '\0', sizeof(*context));
+    memset(&finalcount, '\0', sizeof(finalcount));
+}
+/* ================ end of sha1.c ================ */
+
+
+#endif
diff --git a/libraries/arduinoWebSockets/src/libsha1/libsha1.h b/libraries/arduinoWebSockets/src/libsha1/libsha1.h
new file mode 100644
index 0000000..81a953f
--- /dev/null
+++ b/libraries/arduinoWebSockets/src/libsha1/libsha1.h
@@ -0,0 +1,21 @@
+/* ================ sha1.h ================ */
+/*
+SHA-1 in C
+By Steve Reid <steve@edmweb.com>
+100% Public Domain
+*/
+
+#ifndef ESP8266
+
+typedef struct {
+    uint32_t state[5];
+    uint32_t count[2];
+    unsigned char buffer[64];
+} SHA1_CTX;
+
+void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
+void SHA1Init(SHA1_CTX* context);
+void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len);
+void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
+
+#endif
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/tests/webSocket.html b/libraries/arduinoWebSockets/tests/webSocket.html
new file mode 100644
index 0000000..66a2708
--- /dev/null
+++ b/libraries/arduinoWebSockets/tests/webSocket.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+
+<script>
+var connection = new WebSocket('ws://10.11.2.1:81/', ['arduino']);
+
+connection.onopen = function () {
+	connection.send('Message from Browser to ESP8266 yay its Working!! ' + new Date()); 
+	connection.send('ping');
+	
+/*	setInterval(function() {
+		connection.send('Time: ' + new Date()); 
+	}, 20);
+*/
+connection.send('Time: ' + new Date()); 
+};
+
+connection.onerror = function (error) {
+	console.log('WebSocket Error ', error);
+};
+
+connection.onmessage = function (e) {
+	console.log('Server: ', e.data);
+	connection.send('Time: ' + new Date()); 
+};
+
+function sendRGB() {
+	var r = parseInt(document.getElementById('r').value).toString(16);
+	var g = parseInt(document.getElementById('g').value).toString(16);
+	var b = parseInt(document.getElementById('b').value).toString(16);
+	if(r.length < 2) { r = '0' + r; }
+	if(g.length < 2) { g = '0' + g; }
+	if(b.length < 2) { b = '0' + b; }
+	var rgb = '#'+r+g+b;
+	console.log('RGB: ' + rgb);
+	connection.send(rgb); 
+}
+
+</script>
+
+</head>
+<body>
+LED Control:<br/>
+<br/>
+R: <input id="r" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+G: <input id="g" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+B: <input id="b" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+</body>
+</html>
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/tests/webSocketServer/index.js b/libraries/arduinoWebSockets/tests/webSocketServer/index.js
new file mode 100644
index 0000000..5fc3606
--- /dev/null
+++ b/libraries/arduinoWebSockets/tests/webSocketServer/index.js
@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+var WebSocketServer = require('websocket').server;
+var http = require('http');
+ 
+var server = http.createServer(function(request, response) {
+    console.log((new Date()) + ' Received request for ' + request.url);
+    response.writeHead(404);
+    response.end();
+});
+server.listen(81, function() {
+    console.log((new Date()) + ' Server is listening on port 8011');
+});
+ 
+wsServer = new WebSocketServer({
+    httpServer: server,
+    // You should not use autoAcceptConnections for production 
+    // applications, as it defeats all standard cross-origin protection 
+    // facilities built into the protocol and the browser.  You should 
+    // *always* verify the connection's origin and decide whether or not 
+    // to accept it. 
+    autoAcceptConnections: false
+});
+ 
+function originIsAllowed(origin) {
+  // put logic here to detect whether the specified origin is allowed. 
+  return true;
+}
+ 
+wsServer.on('request', function(request) {
+	
+    if (!originIsAllowed(request.origin)) {
+      // Make sure we only accept requests from an allowed origin 
+      request.reject();
+      console.log((new Date()) + ' Connection from origin ' + request.origin + ' rejected.');
+      return;
+    }
+    
+    var connection = request.accept('arduino', request.origin);
+    console.log((new Date()) + ' Connection accepted.');
+    
+	connection.on('message', function(message) {
+        if (message.type === 'utf8') {
+            console.log('Received Message: ' + message.utf8Data);
+           // connection.sendUTF(message.utf8Data);
+        }
+        else if (message.type === 'binary') {
+            console.log('Received Binary Message of ' + message.binaryData.length + ' bytes');
+           //connection.sendBytes(message.binaryData);
+        }
+    });
+    
+	connection.on('close', function(reasonCode, description) {
+        console.log((new Date()) + ' Peer ' + connection.remoteAddress + ' disconnected.');
+    });
+	
+	connection.sendUTF("Hallo Client!");
+});
\ No newline at end of file
diff --git a/libraries/arduinoWebSockets/tests/webSocketServer/package.json b/libraries/arduinoWebSockets/tests/webSocketServer/package.json
new file mode 100644
index 0000000..9538323
--- /dev/null
+++ b/libraries/arduinoWebSockets/tests/webSocketServer/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "webSocketServer",
+  "version": "1.0.0",
+  "description": "WebSocketServer for testing",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Links2004/arduinoWebSockets"
+  },
+  "keywords": [
+    "esp8266",
+    "websocket",
+    "arduino"
+  ],
+  "author": "Markus Sattler",
+  "license": "LGPLv2",
+  "bugs": {
+    "url": "https://github.com/Links2004/arduinoWebSockets/issues"
+  },
+  "homepage": "https://github.com/Links2004/arduinoWebSockets",
+  "dependencies": {
+    "websocket": "^1.0.18"
+  }
+}
diff --git a/libraries/arduinoWebSockets/tests/webSocket_cb.html b/libraries/arduinoWebSockets/tests/webSocket_cb.html
new file mode 100644
index 0000000..b3badba
--- /dev/null
+++ b/libraries/arduinoWebSockets/tests/webSocket_cb.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+
+<script>
+var connection = new WebSocket('ws://192.168.1.92:81', ['arduino']);
+
+connection.onopen = function () {
+	connection.send('Message from Browser to ESP8266 yay its Working!! ' + new Date()); 
+	connection.send('ping');
+	
+/*	setInterval(function() {
+		connection.send('Time: ' + new Date()); 
+	}, 20);
+*/
+connection.send('Time: ' + new Date()); 
+};
+
+connection.onerror = function (error) {
+	console.log('WebSocket Error ', error);
+};
+
+connection.onmessage = function (e) {
+	console.log('Server: ', e.data);
+	connection.send('Time: ' + new Date()); 
+};
+
+function sendRGB() {
+	var r = parseInt(document.getElementById('r').value).toString(16);
+	var g = parseInt(document.getElementById('g').value).toString(16);
+	var b = parseInt(document.getElementById('b').value).toString(16);
+	if(r.length < 2) { r = '0' + r; }
+	if(g.length < 2) { g = '0' + g; }
+	if(b.length < 2) { b = '0' + b; }
+	var rgb = '#'+r+g+b;
+	console.log('RGB: ' + rgb);
+	connection.send(rgb); 
+}
+
+</script>
+
+</head>
+<body>
+LED Control:<br/>
+<br/>
+R: <input id="r" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+G: <input id="g" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+B: <input id="b" type="range" min="0" max="255" step="1" onchange="sendRGB();" /><br/>
+</body>
+</html>
\ No newline at end of file
diff --git a/libraries/expression_parser_string/expression_parser_string.cpp b/libraries/expression_parser_string/expression_parser_string.cpp
index 09ba178..88feca9 100644
--- a/libraries/expression_parser_string/expression_parser_string.cpp
+++ b/libraries/expression_parser_string/expression_parser_string.cpp
@@ -19,6 +19,10 @@ using namespace std;
 extern char* _parser_error_msg;
 
 #include "expression_parser_string.h"
+String args_var[PARSER_MAX_ARGUMENT_COUNT];
+String tmp_var;
+int args_var_pos = 0;
+int args_var_level = 0;
 
 int ICACHE_FLASH_ATTR parse_expression( const char *expr, PARSER_PREC *value, String &value_str )
  {
@@ -28,6 +32,10 @@ int ICACHE_FLASH_ATTR parse_expression( const char *expr, PARSER_PREC *value, St
 int ICACHE_FLASH_ATTR parse_expression_with_callbacks( const char *expr, parser_variable_callback variable_cb, parser_function_callback function_cb, void *user_data, PARSER_PREC *value, String &str_value ){
 	int r;
 	parser_data pd;
+	args_var_level = 0;
+	args_var_pos = 0;
+	for (int i=0; i<PARSER_MAX_ARGUMENT_COUNT; i++)
+		args_var[i] = "";
 	parser_data_init( &pd, expr, variable_cb, function_cb, user_data );
 	r = parser_parse( &pd, value, str_value );
 	if( pd.error ){
@@ -248,6 +256,11 @@ int ICACHE_FLASH_ATTR parser_read_argument_list( parser_data *pd, int *num_args,
 		r = parser_read_expr( pd, &args[*num_args], ss );
 		// here we try to characterize each element; we could add another array to store the kind of argument available (Double or String)
 		// but we can simply put a nan when the arg is a String and a '\0' when the arg is a Number
+		if (args_var_level <= 1)
+		{
+			args_var[args_var_pos++] = tmp_var;
+			tmp_var = "";
+		}
  		if (r == PARSER_STRING)
 		{
 			args[*num_args] = sqrt(-1); // nan
@@ -398,6 +411,7 @@ int ICACHE_FLASH_ATTR parser_read_builtin( parser_data *pd, PARSER_PREC *value,
  				v0 = parser_round( v0 );
  #endif
 		 } else {
+				args_var_level++;
 				r = parser_read_argument_list( pd, &num_args, args, args_str);
 				delay(0);
 				if( pd->function_cb && (r = pd->function_cb( pd->user_data, token, num_args, args, &v1, args_str, &v1_str)) ){
@@ -409,6 +423,7 @@ int ICACHE_FLASH_ATTR parser_read_builtin( parser_data *pd, PARSER_PREC *value,
 				// delete all allocated String arguments
 				for (int i=0; i<num_args; i++)
 					delete args_str[i];	
+				args_var_level--;
 				// free the allocated memory
 				//free(args);
 			}
@@ -421,6 +436,8 @@ int ICACHE_FLASH_ATTR parser_read_builtin( parser_data *pd, PARSER_PREC *value,
 			if( pd->variable_cb != NULL && (r = pd->variable_cb( pd->user_data, token, &v1, &v1_str )) ){
 					v0 = v1;
 					str_value = v1_str;
+					if (tmp_var == "")
+						tmp_var = token;  // take the name of the variable to be used for variable lookup
 			} else {
 				parser_error( pd, PSTR("Could not look up value for variable!" ));
 			}
@@ -694,18 +711,18 @@ int ICACHE_FLASH_ATTR parser_read_expr( parser_data *pd, PARSER_PREC *value, Str
 		else if ( c == '&' )
 			{
 				r0 = r;
-				s0 = str_value;
-				r = parser_read_term( pd, &v1, str_value );
+				//s0 = str_value;
+				r = parser_read_term( pd, &v1, s0 );
 				// if one of the arguments is string, the result will be a string
 				if ((r0 == PARSER_STRING) || (r == PARSER_STRING))
 				{
 					if (r == PARSER_TRUE)
-						str_value = s0 +  FloatToString(v1);
+						str_value = str_value +  FloatToString(v1);
 					else
 						if (r0 == PARSER_TRUE)
-							str_value =  FloatToString(v0) + str_value;
+							str_value =  FloatToString(v0) + s0;
 						else
-							str_value =  s0 + str_value;
+							str_value.concat(s0);
 					r = PARSER_STRING;
 				}
 				else
diff --git a/libraries/expression_parser_string/expression_parser_string.h b/libraries/expression_parser_string/expression_parser_string.h
index e75a28f..54a1775 100644
--- a/libraries/expression_parser_string/expression_parser_string.h
+++ b/libraries/expression_parser_string/expression_parser_string.h
@@ -76,7 +76,7 @@ using namespace std;
  @brief maximum number of arguments to user-defined functions, define this in the compiler opetions to change.
 */
 #if !defined(PARSER_MAX_ARGUMENT_COUNT)
-#define PARSER_MAX_ARGUMENT_COUNT 6
+#define PARSER_MAX_ARGUMENT_COUNT 8
 #endif
 
 /**
diff --git a/libraries/pubsubclient-master/.gitignore b/libraries/pubsubclient-master/.gitignore
new file mode 100644
index 0000000..1c3ba18
--- /dev/null
+++ b/libraries/pubsubclient-master/.gitignore
@@ -0,0 +1 @@
+tests/bin
diff --git a/libraries/pubsubclient-master/.travis.yml b/libraries/pubsubclient-master/.travis.yml
new file mode 100644
index 0000000..e7b28cb
--- /dev/null
+++ b/libraries/pubsubclient-master/.travis.yml
@@ -0,0 +1,7 @@
+sudo: false
+language: cpp
+compiler:
+  - g++
+script: cd tests && make && make test
+os:
+  - linux
diff --git a/libraries/pubsubclient-master/CHANGES.txt b/libraries/pubsubclient-master/CHANGES.txt
new file mode 100644
index 0000000..8c8bef6
--- /dev/null
+++ b/libraries/pubsubclient-master/CHANGES.txt
@@ -0,0 +1,68 @@
+2.4
+   * Add MQTT_SOCKET_TIMEOUT to prevent it blocking indefinitely
+     whilst waiting for inbound data
+   * Fixed return code when publishing >256 bytes
+   
+2.3
+   * Add publish(topic,payload,retained) function
+
+2.2
+   * Change code layout to match Arduino Library reqs
+
+2.1
+   * Add MAX_TRANSFER_SIZE def to chunk messages if needed
+   * Reject topic/payloads that exceed MQTT_MAX_PACKET_SIZE
+
+2.0
+   * Add (and default to) MQTT 3.1.1 support
+   * Fix PROGMEM handling for Intel Galileo/ESP8266
+   * Add overloaded constructors for convenience
+   * Add chainable setters for server/callback/client/stream
+   * Add state function to return connack return code
+
+1.9
+   * Do not split MQTT packets over multiple calls to _client->write()
+   * API change: All constructors now require an instance of Client
+      to be passed in.
+   * Fixed example to match 1.8 api changes - dpslwk
+   * Added username/password support - WilHall
+   * Added publish_P - publishes messages from PROGMEM - jobytaffey
+
+1.8
+    * KeepAlive interval is configurable in PubSubClient.h
+    * Maximum packet size is configurable in PubSubClient.h
+    * API change: Return boolean rather than int from various functions
+    * API change: Length parameter in message callback changed
+       from int to unsigned int
+    * Various internal tidy-ups around types
+1.7
+    * Improved keepalive handling
+    * Updated to the Arduino-1.0 API
+1.6
+    * Added the ability to publish a retained message
+
+1.5
+    * Added default constructor
+    * Fixed compile error when used with arduino-0021 or later
+
+1.4
+    * Fixed connection lost handling
+
+1.3
+    * Fixed packet reading bug in PubSubClient.readPacket
+
+1.2
+    * Fixed compile error when used with arduino-0016 or later
+
+
+1.1
+    * Reduced size of library
+    * Added support for Will messages
+    * Clarified licensing - see LICENSE.txt
+
+
+1.0
+    * Only Quality of Service (QOS) 0 messaging is supported
+    * The maximum message size, including header, is 128 bytes
+    * The keepalive interval is set to 30 seconds
+    * No support for Will messages
diff --git a/libraries/pubsubclient-master/LICENSE.txt b/libraries/pubsubclient-master/LICENSE.txt
new file mode 100644
index 0000000..217df35
--- /dev/null
+++ b/libraries/pubsubclient-master/LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2008-2015 Nicholas O'Leary
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/libraries/pubsubclient-master/README.md b/libraries/pubsubclient-master/README.md
new file mode 100644
index 0000000..8317691
--- /dev/null
+++ b/libraries/pubsubclient-master/README.md
@@ -0,0 +1,47 @@
+# Arduino Client for MQTT
+
+This library provides a client for doing simple publish/subscribe messaging with
+a server that supports MQTT.
+
+## Examples
+
+The library comes with a number of example sketches. See File > Examples > PubSubClient
+within the Arduino application.
+
+Full API documentation is available here: http://pubsubclient.knolleary.net
+
+## Limitations
+
+ - It can only publish QoS 0 messages. It can subscribe at QoS 0 or QoS 1.
+ - The maximum message size, including header, is **128 bytes** by default. This
+   is configurable via `MQTT_MAX_PACKET_SIZE` in `PubSubClient.h`.
+ - The keepalive interval is set to 15 seconds by default. This is configurable
+   via `MQTT_KEEPALIVE` in `PubSubClient.h`.
+ - The client uses MQTT 3.1.1 by default. It can be changed to use MQTT 3.1 by
+   changing value of `MQTT_VERSION` in `PubSubClient.h`.
+
+
+## Compatible Hardware
+
+The library uses the Arduino Ethernet Client api for interacting with the
+underlying network hardware. This means it Just Works with a growing number of
+boards and shields, including:
+
+ - Arduino Ethernet
+ - Arduino Ethernet Shield
+ - Arduino YUN – use the included `YunClient` in place of `EthernetClient`, and
+   be sure to do a `Bridge.begin()` first
+ - Arduino WiFi Shield - if you want to send packets > 90 bytes with this shield,
+   enable the `MQTT_MAX_TRANSFER_SIZE` define in `PubSubClient.h`.
+ - Sparkfun WiFly Shield – [library](https://github.com/dpslwk/WiFly)
+ - TI CC3000 WiFi - [library](https://github.com/sparkfun/SFE_CC3000_Library)
+ - Intel Galileo/Edison
+ - ESP8266
+
+The library cannot currently be used with hardware based on the ENC28J60 chip –
+such as the Nanode or the Nuelectronics Ethernet Shield. For those, there is an
+[alternative library](https://github.com/njh/NanodeMQTT) available.
+
+## License
+
+This code is released under the MIT License.
diff --git a/libraries/pubsubclient-master/examples/mqtt_auth/mqtt_auth.ino b/libraries/pubsubclient-master/examples/mqtt_auth/mqtt_auth.ino
new file mode 100644
index 0000000..e9f7b18
--- /dev/null
+++ b/libraries/pubsubclient-master/examples/mqtt_auth/mqtt_auth.ino
@@ -0,0 +1,43 @@
+/*
+ Basic MQTT example with Authentication
+
+  - connects to an MQTT server, providing username
+    and password
+  - publishes "hello world" to the topic "outTopic"
+  - subscribes to the topic "inTopic"
+*/
+
+#include <SPI.h>
+#include <Ethernet.h>
+#include <PubSubClient.h>
+
+// Update these with values suitable for your network.
+byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
+IPAddress ip(172, 16, 0, 100);
+IPAddress server(172, 16, 0, 2);
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  // handle message arrived
+}
+
+EthernetClient ethClient;
+PubSubClient client(server, 1883, callback, ethClient);
+
+void setup()
+{
+  Ethernet.begin(mac, ip);
+  // Note - the default maximum packet size is 128 bytes. If the
+  // combined length of clientId, username and password exceed this,
+  // you will need to increase the value of MQTT_MAX_PACKET_SIZE in
+  // PubSubClient.h
+  
+  if (client.connect("arduinoClient", "testuser", "testpass")) {
+    client.publish("outTopic","hello world");
+    client.subscribe("inTopic");
+  }
+}
+
+void loop()
+{
+  client.loop();
+}
diff --git a/libraries/pubsubclient-master/examples/mqtt_basic/mqtt_basic.ino b/libraries/pubsubclient-master/examples/mqtt_basic/mqtt_basic.ino
new file mode 100644
index 0000000..f545ade
--- /dev/null
+++ b/libraries/pubsubclient-master/examples/mqtt_basic/mqtt_basic.ino
@@ -0,0 +1,77 @@
+/*
+ Basic MQTT example
+
+ This sketch demonstrates the basic capabilities of the library.
+ It connects to an MQTT server then:
+  - publishes "hello world" to the topic "outTopic"
+  - subscribes to the topic "inTopic", printing out any messages
+    it receives. NB - it assumes the received payloads are strings not binary
+
+ It will reconnect to the server if the connection is lost using a blocking
+ reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
+ achieve the same result without blocking the main loop.
+ 
+*/
+
+#include <SPI.h>
+#include <Ethernet.h>
+#include <PubSubClient.h>
+
+// Update these with values suitable for your network.
+byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
+IPAddress ip(172, 16, 0, 100);
+IPAddress server(172, 16, 0, 2);
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  Serial.print("Message arrived [");
+  Serial.print(topic);
+  Serial.print("] ");
+  for (int i=0;i<length;i++) {
+    Serial.print((char)payload[i]);
+  }
+  Serial.println();
+}
+
+EthernetClient ethClient;
+PubSubClient client(ethClient);
+
+void reconnect() {
+  // Loop until we're reconnected
+  while (!client.connected()) {
+    Serial.print("Attempting MQTT connection...");
+    // Attempt to connect
+    if (client.connect("arduinoClient")) {
+      Serial.println("connected");
+      // Once connected, publish an announcement...
+      client.publish("outTopic","hello world");
+      // ... and resubscribe
+      client.subscribe("inTopic");
+    } else {
+      Serial.print("failed, rc=");
+      Serial.print(client.state());
+      Serial.println(" try again in 5 seconds");
+      // Wait 5 seconds before retrying
+      delay(5000);
+    }
+  }
+}
+
+void setup()
+{
+  Serial.begin(57600);
+
+  client.setServer(server, 1883);
+  client.setCallback(callback);
+
+  Ethernet.begin(mac, ip);
+  // Allow the hardware to sort itself out
+  delay(1500);
+}
+
+void loop()
+{
+  if (!client.connected()) {
+    reconnect();
+  }
+  client.loop();
+}
diff --git a/libraries/pubsubclient-master/examples/mqtt_esp8266/mqtt_esp8266.ino b/libraries/pubsubclient-master/examples/mqtt_esp8266/mqtt_esp8266.ino
new file mode 100644
index 0000000..a08e7fd
--- /dev/null
+++ b/libraries/pubsubclient-master/examples/mqtt_esp8266/mqtt_esp8266.ino
@@ -0,0 +1,127 @@
+/*
+ Basic ESP8266 MQTT example
+
+ This sketch demonstrates the capabilities of the pubsub library in combination
+ with the ESP8266 board/library.
+
+ It connects to an MQTT server then:
+  - publishes "hello world" to the topic "outTopic" every two seconds
+  - subscribes to the topic "inTopic", printing out any messages
+    it receives. NB - it assumes the received payloads are strings not binary
+  - If the first character of the topic "inTopic" is an 1, switch ON the ESP Led,
+    else switch it off
+
+ It will reconnect to the server if the connection is lost using a blocking
+ reconnect function. See the 'mqtt_reconnect_nonblocking' example for how to
+ achieve the same result without blocking the main loop.
+
+ To install the ESP8266 board, (using Arduino 1.6.4+):
+  - Add the following 3rd party board manager under "File -> Preferences -> Additional Boards Manager URLs":
+       http://arduino.esp8266.com/stable/package_esp8266com_index.json
+  - Open the "Tools -> Board -> Board Manager" and click install for the ESP8266"
+  - Select your ESP8266 in "Tools -> Board"
+
+*/
+
+#include <ESP8266WiFi.h>
+#include <PubSubClient.h>
+
+// Update these with values suitable for your network.
+
+const char* ssid = "........";
+const char* password = "........";
+const char* mqtt_server = "broker.mqtt-dashboard.com";
+
+WiFiClient espClient;
+PubSubClient client(espClient);
+long lastMsg = 0;
+char msg[50];
+int value = 0;
+
+void setup_wifi() {
+
+  delay(10);
+  // We start by connecting to a WiFi network
+  Serial.println();
+  Serial.print("Connecting to ");
+  Serial.println(ssid);
+
+  WiFi.begin(ssid, password);
+
+  while (WiFi.status() != WL_CONNECTED) {
+    delay(500);
+    Serial.print(".");
+  }
+
+  Serial.println("");
+  Serial.println("WiFi connected");
+  Serial.println("IP address: ");
+  Serial.println(WiFi.localIP());
+}
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  Serial.print("Message arrived [");
+  Serial.print(topic);
+  Serial.print("] ");
+  for (int i = 0; i < length; i++) {
+    Serial.print((char)payload[i]);
+  }
+  Serial.println();
+
+  // Switch on the LED if an 1 was received as first character
+  if ((char)payload[0] == '1') {
+    digitalWrite(BUILTIN_LED, LOW);   // Turn the LED on (Note that LOW is the voltage level
+    // but actually the LED is on; this is because
+    // it is acive low on the ESP-01)
+  } else {
+    digitalWrite(BUILTIN_LED, HIGH);  // Turn the LED off by making the voltage HIGH
+  }
+
+}
+
+void reconnect() {
+  // Loop until we're reconnected
+  while (!client.connected()) {
+    Serial.print("Attempting MQTT connection...");
+    // Attempt to connect
+    if (client.connect("ESP8266Client")) {
+      Serial.println("connected");
+      // Once connected, publish an announcement...
+      client.publish("outTopic", "hello world");
+      // ... and resubscribe
+      client.subscribe("inTopic");
+    } else {
+      Serial.print("failed, rc=");
+      Serial.print(client.state());
+      Serial.println(" try again in 5 seconds");
+      // Wait 5 seconds before retrying
+      delay(5000);
+    }
+  }
+}
+
+void setup() {
+  pinMode(BUILTIN_LED, OUTPUT);     // Initialize the BUILTIN_LED pin as an output
+  Serial.begin(115200);
+  setup_wifi();
+  client.setServer(mqtt_server, 1883);
+  client.setCallback(callback);
+}
+
+void loop() {
+
+  if (!client.connected()) {
+    reconnect();
+  }
+  client.loop();
+
+  long now = millis();
+  if (now - lastMsg > 2000) {
+    lastMsg = now;
+    ++value;
+    snprintf (msg, 75, "hello world #%ld", value);
+    Serial.print("Publish message: ");
+    Serial.println(msg);
+    client.publish("outTopic", msg);
+  }
+}
diff --git a/libraries/pubsubclient-master/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino b/libraries/pubsubclient-master/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
new file mode 100644
index 0000000..42afb2a
--- /dev/null
+++ b/libraries/pubsubclient-master/examples/mqtt_publish_in_callback/mqtt_publish_in_callback.ino
@@ -0,0 +1,60 @@
+/*
+ Publishing in the callback
+
+  - connects to an MQTT server
+  - subscribes to the topic "inTopic"
+  - when a message is received, republishes it to "outTopic"
+
+  This example shows how to publish messages within the
+  callback function. The callback function header needs to
+  be declared before the PubSubClient constructor and the
+  actual callback defined afterwards.
+  This ensures the client reference in the callback function
+  is valid.
+
+*/
+
+#include <SPI.h>
+#include <Ethernet.h>
+#include <PubSubClient.h>
+
+// Update these with values suitable for your network.
+byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
+IPAddress ip(172, 16, 0, 100);
+IPAddress server(172, 16, 0, 2);
+
+// Callback function header
+void callback(char* topic, byte* payload, unsigned int length);
+
+EthernetClient ethClient;
+PubSubClient client(server, 1883, callback, ethClient);
+
+// Callback function
+void callback(char* topic, byte* payload, unsigned int length) {
+  // In order to republish this payload, a copy must be made
+  // as the orignal payload buffer will be overwritten whilst
+  // constructing the PUBLISH packet.
+
+  // Allocate the correct amount of memory for the payload copy
+  byte* p = (byte*)malloc(length);
+  // Copy the payload to the new buffer
+  memcpy(p,payload,length);
+  client.publish("outTopic", p, length);
+  // Free the memory
+  free(p);
+}
+
+void setup()
+{
+
+  Ethernet.begin(mac, ip);
+  if (client.connect("arduinoClient")) {
+    client.publish("outTopic","hello world");
+    client.subscribe("inTopic");
+  }
+}
+
+void loop()
+{
+  client.loop();
+}
diff --git a/libraries/pubsubclient-master/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino b/libraries/pubsubclient-master/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
new file mode 100644
index 0000000..080b739
--- /dev/null
+++ b/libraries/pubsubclient-master/examples/mqtt_reconnect_nonblocking/mqtt_reconnect_nonblocking.ino
@@ -0,0 +1,67 @@
+/*
+ Reconnecting MQTT example - non-blocking
+
+ This sketch demonstrates how to keep the client connected
+ using a non-blocking reconnect function. If the client loses
+ its connection, it attempts to reconnect every 5 seconds
+ without blocking the main loop.
+
+*/
+
+#include <SPI.h>
+#include <Ethernet.h>
+#include <PubSubClient.h>
+
+// Update these with values suitable for your hardware/network.
+byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
+IPAddress ip(172, 16, 0, 100);
+IPAddress server(172, 16, 0, 2);
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  // handle message arrived
+}
+
+EthernetClient ethClient;
+PubSubClient client(ethClient);
+
+long lastReconnectAttempt = 0;
+
+boolean reconnect() {
+  if (client.connect("arduinoClient")) {
+    // Once connected, publish an announcement...
+    client.publish("outTopic","hello world");
+    // ... and resubscribe
+    client.subscribe("inTopic");
+  }
+  return client.connected();
+}
+
+void setup()
+{
+  client.setServer(server, 1883);
+  client.setCallback(callback);
+
+  Ethernet.begin(mac, ip);
+  delay(1500);
+  lastReconnectAttempt = 0;
+}
+
+
+void loop()
+{
+  if (!client.connected()) {
+    long now = millis();
+    if (now - lastReconnectAttempt > 5000) {
+      lastReconnectAttempt = now;
+      // Attempt to reconnect
+      if (reconnect()) {
+        lastReconnectAttempt = 0;
+      }
+    }
+  } else {
+    // Client connected
+
+    client.loop();
+  }
+
+}
diff --git a/libraries/pubsubclient-master/examples/mqtt_stream/mqtt_stream.ino b/libraries/pubsubclient-master/examples/mqtt_stream/mqtt_stream.ino
new file mode 100644
index 0000000..67c2287
--- /dev/null
+++ b/libraries/pubsubclient-master/examples/mqtt_stream/mqtt_stream.ino
@@ -0,0 +1,57 @@
+/*
+ Example of using a Stream object to store the message payload
+
+ Uses SRAM library: https://github.com/ennui2342/arduino-sram
+ but could use any Stream based class such as SD
+
+  - connects to an MQTT server
+  - publishes "hello world" to the topic "outTopic"
+  - subscribes to the topic "inTopic"
+*/
+
+#include <SPI.h>
+#include <Ethernet.h>
+#include <PubSubClient.h>
+#include <SRAM.h>
+
+// Update these with values suitable for your network.
+byte mac[]    = {  0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED };
+IPAddress ip(172, 16, 0, 100);
+IPAddress server(172, 16, 0, 2);
+
+SRAM sram(4, SRAM_1024);
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  sram.seek(1);
+
+  // do something with the message
+  for(uint8_t i=0; i<length; i++) {
+    Serial.write(sram.read());
+  }
+  Serial.println();
+
+  // Reset position for the next message to be stored
+  sram.seek(1);
+}
+
+EthernetClient ethClient;
+PubSubClient client(server, 1883, callback, ethClient, sram);
+
+void setup()
+{
+  Ethernet.begin(mac, ip);
+  if (client.connect("arduinoClient")) {
+    client.publish("outTopic","hello world");
+    client.subscribe("inTopic");
+  }
+
+  sram.begin();
+  sram.seek(1);
+
+  Serial.begin(9600);
+}
+
+void loop()
+{
+  client.loop();
+}
diff --git a/libraries/pubsubclient-master/keywords.txt b/libraries/pubsubclient-master/keywords.txt
new file mode 100644
index 0000000..b979588
--- /dev/null
+++ b/libraries/pubsubclient-master/keywords.txt
@@ -0,0 +1,30 @@
+#######################################
+# Syntax Coloring Map For PubSubClient
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+PubSubClient	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+connect 	KEYWORD2
+disconnect 	KEYWORD2
+publish 	KEYWORD2
+publish_P 	KEYWORD2
+subscribe 	KEYWORD2
+unsubscribe 	KEYWORD2
+loop 	KEYWORD2
+connected 	KEYWORD2
+setServer	KEYWORD2
+setCallback	KEYWORD2
+setClient	KEYWORD2
+setStream	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/libraries/pubsubclient-master/library.json b/libraries/pubsubclient-master/library.json
new file mode 100644
index 0000000..b967390
--- /dev/null
+++ b/libraries/pubsubclient-master/library.json
@@ -0,0 +1,17 @@
+{
+    "name": "PubSubClient",
+    "keywords": "ethernet, mqtt, m2m, iot",
+    "description": "A client library for MQTT messaging. MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000.",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/knolleary/pubsubclient.git"
+    },
+    "version": "2.6",
+    "exclude": "tests",
+    "examples": "examples/*/*.ino",
+    "frameworks": "arduino",
+    "platforms": [
+        "atmelavr",
+        "espressif"
+    ]
+}
diff --git a/libraries/pubsubclient-master/library.properties b/libraries/pubsubclient-master/library.properties
new file mode 100644
index 0000000..3ceeda8
--- /dev/null
+++ b/libraries/pubsubclient-master/library.properties
@@ -0,0 +1,9 @@
+name=PubSubClient
+version=2.6
+author=Nick O'Leary <nick.oleary@gmail.com>
+maintainer=Nick O'Leary <nick.oleary@gmail.com>
+sentence=A client library for MQTT messaging.
+paragraph=MQTT is a lightweight messaging protocol ideal for small devices. This library allows you to send and receive MQTT messages. It supports the latest MQTT 3.1.1 protocol and can be configured to use the older MQTT 3.1 if needed. It supports all Arduino Ethernet Client compatible hardware, including the Intel Galileo/Edison, ESP8266 and TI CC3000.
+category=Communication
+url=http://pubsubclient.knolleary.net
+architectures=*
diff --git a/libraries/pubsubclient-master/src/PubSubClient.cpp b/libraries/pubsubclient-master/src/PubSubClient.cpp
new file mode 100644
index 0000000..9658c4a
--- /dev/null
+++ b/libraries/pubsubclient-master/src/PubSubClient.cpp
@@ -0,0 +1,590 @@
+/*
+  PubSubClient.cpp - A simple client for MQTT.
+  Nick O'Leary
+  http://knolleary.net
+*/
+
+#include "PubSubClient.h"
+#include "Arduino.h"
+
+PubSubClient::PubSubClient() {
+    this->_state = MQTT_DISCONNECTED;
+    this->_client = NULL;
+    this->stream = NULL;
+    setCallback(NULL);
+}
+
+PubSubClient::PubSubClient(Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setClient(client);
+    this->stream = NULL;
+}
+
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr, port);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr,port);
+    setClient(client);
+    setStream(stream);
+}
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr, port);
+    setCallback(callback);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(IPAddress addr, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(addr,port);
+    setCallback(callback);
+    setClient(client);
+    setStream(stream);
+}
+
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip, port);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip,port);
+    setClient(client);
+    setStream(stream);
+}
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip, port);
+    setCallback(callback);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(uint8_t *ip, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(ip,port);
+    setCallback(callback);
+    setClient(client);
+    setStream(stream);
+}
+
+PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(const char* domain, uint16_t port, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setClient(client);
+    setStream(stream);
+}
+PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setCallback(callback);
+    setClient(client);
+    this->stream = NULL;
+}
+PubSubClient::PubSubClient(const char* domain, uint16_t port, MQTT_CALLBACK_SIGNATURE, Client& client, Stream& stream) {
+    this->_state = MQTT_DISCONNECTED;
+    setServer(domain,port);
+    setCallback(callback);
+    setClient(client);
+    setStream(stream);
+}
+
+boolean PubSubClient::connect(const char *id) {
+    return connect(id,NULL,NULL,0,0,0,0);
+}
+
+boolean PubSubClient::connect(const char *id, const char *user, const char *pass) {
+    return connect(id,user,pass,0,0,0,0);
+}
+
+boolean PubSubClient::connect(const char *id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
+    return connect(id,NULL,NULL,willTopic,willQos,willRetain,willMessage);
+}
+
+boolean PubSubClient::connect(const char *id, const char *user, const char *pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage) {
+    if (!connected()) {
+        int result = 0;
+
+        if (domain != NULL) {
+            result = _client->connect(this->domain, this->port);
+        } else {
+            result = _client->connect(this->ip, this->port);
+        }
+        if (result == 1) {
+            nextMsgId = 1;
+            // Leave room in the buffer for header and variable length field
+            uint16_t length = 5;
+            unsigned int j;
+
+#if MQTT_VERSION == MQTT_VERSION_3_1
+            uint8_t d[9] = {0x00,0x06,'M','Q','I','s','d','p', MQTT_VERSION};
+#define MQTT_HEADER_VERSION_LENGTH 9
+#elif MQTT_VERSION == MQTT_VERSION_3_1_1
+            uint8_t d[7] = {0x00,0x04,'M','Q','T','T',MQTT_VERSION};
+#define MQTT_HEADER_VERSION_LENGTH 7
+#endif
+            for (j = 0;j<MQTT_HEADER_VERSION_LENGTH;j++) {
+                buffer[length++] = d[j];
+            }
+
+            uint8_t v;
+            if (willTopic) {
+                v = 0x06|(willQos<<3)|(willRetain<<5);
+            } else {
+                v = 0x02;
+            }
+
+            if(user != NULL) {
+                v = v|0x80;
+
+                if(pass != NULL) {
+                    v = v|(0x80>>1);
+                }
+            }
+
+            buffer[length++] = v;
+
+            buffer[length++] = ((MQTT_KEEPALIVE) >> 8);
+            buffer[length++] = ((MQTT_KEEPALIVE) & 0xFF);
+            length = writeString(id,buffer,length);
+            if (willTopic) {
+                length = writeString(willTopic,buffer,length);
+                length = writeString(willMessage,buffer,length);
+            }
+
+            if(user != NULL) {
+                length = writeString(user,buffer,length);
+                if(pass != NULL) {
+                    length = writeString(pass,buffer,length);
+                }
+            }
+
+            write(MQTTCONNECT,buffer,length-5);
+
+            lastInActivity = lastOutActivity = millis();
+
+            while (!_client->available()) {
+                unsigned long t = millis();
+                if (t-lastInActivity >= ((int32_t) MQTT_SOCKET_TIMEOUT*1000UL)) {
+                    _state = MQTT_CONNECTION_TIMEOUT;
+                    _client->stop();
+                    return false;
+                }
+            }
+            uint8_t llen;
+            uint16_t len = readPacket(&llen);
+
+            if (len == 4) {
+                if (buffer[3] == 0) {
+                    lastInActivity = millis();
+                    pingOutstanding = false;
+                    _state = MQTT_CONNECTED;
+                    return true;
+                } else {
+                    _state = buffer[3];
+                }
+            }
+            _client->stop();
+        } else {
+            _state = MQTT_CONNECT_FAILED;
+        }
+        return false;
+    }
+    return true;
+}
+
+// reads a byte into result
+boolean PubSubClient::readByte(uint8_t * result) {
+   uint32_t previousMillis = millis();
+   while(!_client->available()) {
+     uint32_t currentMillis = millis();
+     if(currentMillis - previousMillis >= ((int32_t) MQTT_SOCKET_TIMEOUT * 1000)){
+       return false;
+     }
+   }
+   *result = _client->read();
+   return true;
+}
+
+// reads a byte into result[*index] and increments index
+boolean PubSubClient::readByte(uint8_t * result, uint16_t * index){
+  uint16_t current_index = *index;
+  uint8_t * write_address = &(result[current_index]);
+  if(readByte(write_address)){
+    *index = current_index + 1;
+    return true;
+  }
+  return false;
+}
+
+uint16_t PubSubClient::readPacket(uint8_t* lengthLength) {
+    uint16_t len = 0;
+    if(!readByte(buffer, &len)) return 0;
+    bool isPublish = (buffer[0]&0xF0) == MQTTPUBLISH;
+    uint32_t multiplier = 1;
+    uint16_t length = 0;
+    uint8_t digit = 0;
+    uint16_t skip = 0;
+    uint8_t start = 0;
+
+    do {
+        if(!readByte(&digit)) return 0;
+        buffer[len++] = digit;
+        length += (digit & 127) * multiplier;
+        multiplier *= 128;
+    } while ((digit & 128) != 0);
+    *lengthLength = len-1;
+
+    if (isPublish) {
+        // Read in topic length to calculate bytes to skip over for Stream writing
+        if(!readByte(buffer, &len)) return 0;
+        if(!readByte(buffer, &len)) return 0;
+        skip = (buffer[*lengthLength+1]<<8)+buffer[*lengthLength+2];
+        start = 2;
+        if (buffer[0]&MQTTQOS1) {
+            // skip message id
+            skip += 2;
+        }
+    }
+
+    for (uint16_t i = start;i<length;i++) {
+        if(!readByte(&digit)) return 0;
+        if (this->stream) {
+            if (isPublish && len-*lengthLength-2>skip) {
+                this->stream->write(digit);
+            }
+        }
+        if (len < MQTT_MAX_PACKET_SIZE) {
+            buffer[len] = digit;
+        }
+        len++;
+    }
+
+    if (!this->stream && len > MQTT_MAX_PACKET_SIZE) {
+        len = 0; // This will cause the packet to be ignored.
+    }
+
+    return len;
+}
+
+boolean PubSubClient::loop() {
+    if (connected()) {
+        unsigned long t = millis();
+        if ((t - lastInActivity > MQTT_KEEPALIVE*1000UL) || (t - lastOutActivity > MQTT_KEEPALIVE*1000UL)) {
+            if (pingOutstanding) {
+                this->_state = MQTT_CONNECTION_TIMEOUT;
+                _client->stop();
+                return false;
+            } else {
+                buffer[0] = MQTTPINGREQ;
+                buffer[1] = 0;
+                _client->write(buffer,2);
+                lastOutActivity = t;
+                lastInActivity = t;
+                pingOutstanding = true;
+            }
+        }
+        if (_client->available()) {
+            uint8_t llen;
+            uint16_t len = readPacket(&llen);
+            uint16_t msgId = 0;
+            uint8_t *payload;
+            if (len > 0) {
+                lastInActivity = t;
+                uint8_t type = buffer[0]&0xF0;
+                if (type == MQTTPUBLISH) {
+                    if (callback) {
+                        uint16_t tl = (buffer[llen+1]<<8)+buffer[llen+2];
+                        char topic[tl+1];
+                        for (uint16_t i=0;i<tl;i++) {
+                            topic[i] = buffer[llen+3+i];
+                        }
+                        topic[tl] = 0;
+                        // msgId only present for QOS>0
+                        if ((buffer[0]&0x06) == MQTTQOS1) {
+                            msgId = (buffer[llen+3+tl]<<8)+buffer[llen+3+tl+1];
+                            payload = buffer+llen+3+tl+2;
+                            callback(topic,payload,len-llen-3-tl-2);
+
+                            buffer[0] = MQTTPUBACK;
+                            buffer[1] = 2;
+                            buffer[2] = (msgId >> 8);
+                            buffer[3] = (msgId & 0xFF);
+                            _client->write(buffer,4);
+                            lastOutActivity = t;
+
+                        } else {
+                            payload = buffer+llen+3+tl;
+                            callback(topic,payload,len-llen-3-tl);
+                        }
+                    }
+                } else if (type == MQTTPINGREQ) {
+                    buffer[0] = MQTTPINGRESP;
+                    buffer[1] = 0;
+                    _client->write(buffer,2);
+                } else if (type == MQTTPINGRESP) {
+                    pingOutstanding = false;
+                }
+            }
+        }
+        return true;
+    }
+    return false;
+}
+
+boolean PubSubClient::publish(const char* topic, const char* payload) {
+    return publish(topic,(const uint8_t*)payload,strlen(payload),false);
+}
+
+boolean PubSubClient::publish(const char* topic, const char* payload, boolean retained) {
+    return publish(topic,(const uint8_t*)payload,strlen(payload),retained);
+}
+
+boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength) {
+    return publish(topic, payload, plength, false);
+}
+
+boolean PubSubClient::publish(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
+    if (connected()) {
+        if (MQTT_MAX_PACKET_SIZE < 5 + 2+strlen(topic) + plength) {
+            // Too long
+            return false;
+        }
+        // Leave room in the buffer for header and variable length field
+        uint16_t length = 5;
+        length = writeString(topic,buffer,length);
+        uint16_t i;
+        for (i=0;i<plength;i++) {
+            buffer[length++] = payload[i];
+        }
+        uint8_t header = MQTTPUBLISH;
+        if (retained) {
+            header |= 1;
+        }
+        return write(header,buffer,length-5);
+    }
+    return false;
+}
+
+boolean PubSubClient::publish_P(const char* topic, const uint8_t* payload, unsigned int plength, boolean retained) {
+    uint8_t llen = 0;
+    uint8_t digit;
+    unsigned int rc = 0;
+    uint16_t tlen;
+    unsigned int pos = 0;
+    unsigned int i;
+    uint8_t header;
+    unsigned int len;
+
+    if (!connected()) {
+        return false;
+    }
+
+    tlen = strlen(topic);
+
+    header = MQTTPUBLISH;
+    if (retained) {
+        header |= 1;
+    }
+    buffer[pos++] = header;
+    len = plength + 2 + tlen;
+    do {
+        digit = len % 128;
+        len = len / 128;
+        if (len > 0) {
+            digit |= 0x80;
+        }
+        buffer[pos++] = digit;
+        llen++;
+    } while(len>0);
+
+    pos = writeString(topic,buffer,pos);
+
+    rc += _client->write(buffer,pos);
+
+    for (i=0;i<plength;i++) {
+        rc += _client->write((char)pgm_read_byte_near(payload + i));
+    }
+
+    lastOutActivity = millis();
+
+    return rc == tlen + 4 + plength;
+}
+
+boolean PubSubClient::write(uint8_t header, uint8_t* buf, uint16_t length) {
+    uint8_t lenBuf[4];
+    uint8_t llen = 0;
+    uint8_t digit;
+    uint8_t pos = 0;
+    uint16_t rc;
+    uint16_t len = length;
+    do {
+        digit = len % 128;
+        len = len / 128;
+        if (len > 0) {
+            digit |= 0x80;
+        }
+        lenBuf[pos++] = digit;
+        llen++;
+    } while(len>0);
+
+    buf[4-llen] = header;
+    for (int i=0;i<llen;i++) {
+        buf[5-llen+i] = lenBuf[i];
+    }
+
+#ifdef MQTT_MAX_TRANSFER_SIZE
+    uint8_t* writeBuf = buf+(4-llen);
+    uint16_t bytesRemaining = length+1+llen;  //Match the length type
+    uint8_t bytesToWrite;
+    boolean result = true;
+    while((bytesRemaining > 0) && result) {
+        bytesToWrite = (bytesRemaining > MQTT_MAX_TRANSFER_SIZE)?MQTT_MAX_TRANSFER_SIZE:bytesRemaining;
+        rc = _client->write(writeBuf,bytesToWrite);
+        result = (rc == bytesToWrite);
+        bytesRemaining -= rc;
+        writeBuf += rc;
+    }
+    return result;
+#else
+    rc = _client->write(buf+(4-llen),length+1+llen);
+    lastOutActivity = millis();
+    return (rc == 1+llen+length);
+#endif
+}
+
+boolean PubSubClient::subscribe(const char* topic) {
+    return subscribe(topic, 0);
+}
+
+boolean PubSubClient::subscribe(const char* topic, uint8_t qos) {
+    if (qos < 0 || qos > 1) {
+        return false;
+    }
+    if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) {
+        // Too long
+        return false;
+    }
+    if (connected()) {
+        // Leave room in the buffer for header and variable length field
+        uint16_t length = 5;
+        nextMsgId++;
+        if (nextMsgId == 0) {
+            nextMsgId = 1;
+        }
+        buffer[length++] = (nextMsgId >> 8);
+        buffer[length++] = (nextMsgId & 0xFF);
+        length = writeString((char*)topic, buffer,length);
+        buffer[length++] = qos;
+        return write(MQTTSUBSCRIBE|MQTTQOS1,buffer,length-5);
+    }
+    return false;
+}
+
+boolean PubSubClient::unsubscribe(const char* topic) {
+    if (MQTT_MAX_PACKET_SIZE < 9 + strlen(topic)) {
+        // Too long
+        return false;
+    }
+    if (connected()) {
+        uint16_t length = 5;
+        nextMsgId++;
+        if (nextMsgId == 0) {
+            nextMsgId = 1;
+        }
+        buffer[length++] = (nextMsgId >> 8);
+        buffer[length++] = (nextMsgId & 0xFF);
+        length = writeString(topic, buffer,length);
+        return write(MQTTUNSUBSCRIBE|MQTTQOS1,buffer,length-5);
+    }
+    return false;
+}
+
+void PubSubClient::disconnect() {
+    buffer[0] = MQTTDISCONNECT;
+    buffer[1] = 0;
+    _client->write(buffer,2);
+    _state = MQTT_DISCONNECTED;
+    _client->stop();
+    lastInActivity = lastOutActivity = millis();
+}
+
+uint16_t PubSubClient::writeString(const char* string, uint8_t* buf, uint16_t pos) {
+    const char* idp = string;
+    uint16_t i = 0;
+    pos += 2;
+    while (*idp) {
+        buf[pos++] = *idp++;
+        i++;
+    }
+    buf[pos-i-2] = (i >> 8);
+    buf[pos-i-1] = (i & 0xFF);
+    return pos;
+}
+
+
+boolean PubSubClient::connected() {
+    boolean rc;
+    if (_client == NULL ) {
+        rc = false;
+    } else {
+        rc = (int)_client->connected();
+        if (!rc) {
+            if (this->_state == MQTT_CONNECTED) {
+                this->_state = MQTT_CONNECTION_LOST;
+                _client->flush();
+                _client->stop();
+            }
+        }
+    }
+    return rc;
+}
+
+PubSubClient& PubSubClient::setServer(uint8_t * ip, uint16_t port) {
+    IPAddress addr(ip[0],ip[1],ip[2],ip[3]);
+    return setServer(addr,port);
+}
+
+PubSubClient& PubSubClient::setServer(IPAddress ip, uint16_t port) {
+    this->ip = ip;
+    this->port = port;
+    this->domain = NULL;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setServer(const char * domain, uint16_t port) {
+    this->domain = domain;
+    this->port = port;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setCallback(MQTT_CALLBACK_SIGNATURE) {
+    this->callback = callback;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setClient(Client& client){
+    this->_client = &client;
+    return *this;
+}
+
+PubSubClient& PubSubClient::setStream(Stream& stream){
+    this->stream = &stream;
+    return *this;
+}
+
+int PubSubClient::state() {
+    return this->_state;
+}
diff --git a/libraries/pubsubclient-master/src/PubSubClient.h b/libraries/pubsubclient-master/src/PubSubClient.h
new file mode 100644
index 0000000..508817b
--- /dev/null
+++ b/libraries/pubsubclient-master/src/PubSubClient.h
@@ -0,0 +1,144 @@
+/*
+ PubSubClient.h - A simple client for MQTT.
+  Nick O'Leary
+  http://knolleary.net
+*/
+
+#ifndef PubSubClient_h
+#define PubSubClient_h
+
+#include <Arduino.h>
+#include "IPAddress.h"
+#include "Client.h"
+#include "Stream.h"
+
+#define MQTT_VERSION_3_1      3
+#define MQTT_VERSION_3_1_1    4
+
+// MQTT_VERSION : Pick the version
+//#define MQTT_VERSION MQTT_VERSION_3_1
+#ifndef MQTT_VERSION
+#define MQTT_VERSION MQTT_VERSION_3_1_1
+#endif
+
+// MQTT_MAX_PACKET_SIZE : Maximum packet size
+#ifndef MQTT_MAX_PACKET_SIZE
+#define MQTT_MAX_PACKET_SIZE 128
+#endif
+
+// MQTT_KEEPALIVE : keepAlive interval in Seconds
+#ifndef MQTT_KEEPALIVE
+#define MQTT_KEEPALIVE 35
+#endif
+
+// MQTT_SOCKET_TIMEOUT: socket timeout interval in Seconds
+#ifndef MQTT_SOCKET_TIMEOUT
+#define MQTT_SOCKET_TIMEOUT 35
+#endif
+
+// MQTT_MAX_TRANSFER_SIZE : limit how much data is passed to the network client
+//  in each write call. Needed for the Arduino Wifi Shield. Leave undefined to
+//  pass the entire MQTT packet in each write call.
+//#define MQTT_MAX_TRANSFER_SIZE 80
+
+// Possible values for client.state()
+#define MQTT_CONNECTION_TIMEOUT     -4
+#define MQTT_CONNECTION_LOST        -3
+#define MQTT_CONNECT_FAILED         -2
+#define MQTT_DISCONNECTED           -1
+#define MQTT_CONNECTED               0
+#define MQTT_CONNECT_BAD_PROTOCOL    1
+#define MQTT_CONNECT_BAD_CLIENT_ID   2
+#define MQTT_CONNECT_UNAVAILABLE     3
+#define MQTT_CONNECT_BAD_CREDENTIALS 4
+#define MQTT_CONNECT_UNAUTHORIZED    5
+
+#define MQTTCONNECT     1 << 4  // Client request to connect to Server
+#define MQTTCONNACK     2 << 4  // Connect Acknowledgment
+#define MQTTPUBLISH     3 << 4  // Publish message
+#define MQTTPUBACK      4 << 4  // Publish Acknowledgment
+#define MQTTPUBREC      5 << 4  // Publish Received (assured delivery part 1)
+#define MQTTPUBREL      6 << 4  // Publish Release (assured delivery part 2)
+#define MQTTPUBCOMP     7 << 4  // Publish Complete (assured delivery part 3)
+#define MQTTSUBSCRIBE   8 << 4  // Client Subscribe request
+#define MQTTSUBACK      9 << 4  // Subscribe Acknowledgment
+#define MQTTUNSUBSCRIBE 10 << 4 // Client Unsubscribe request
+#define MQTTUNSUBACK    11 << 4 // Unsubscribe Acknowledgment
+#define MQTTPINGREQ     12 << 4 // PING Request
+#define MQTTPINGRESP    13 << 4 // PING Response
+#define MQTTDISCONNECT  14 << 4 // Client is Disconnecting
+#define MQTTReserved    15 << 4 // Reserved
+
+#define MQTTQOS0        (0 << 1)
+#define MQTTQOS1        (1 << 1)
+#define MQTTQOS2        (2 << 1)
+
+#ifdef ESP8266
+#include <functional>
+#define MQTT_CALLBACK_SIGNATURE std::function<void(char*, uint8_t*, unsigned int)> callback
+#else
+#define MQTT_CALLBACK_SIGNATURE void (*callback)(char*, uint8_t*, unsigned int)
+#endif
+
+class PubSubClient {
+private:
+   Client* _client;
+   uint8_t buffer[MQTT_MAX_PACKET_SIZE];
+   uint16_t nextMsgId;
+   unsigned long lastOutActivity;
+   unsigned long lastInActivity;
+   bool pingOutstanding;
+   MQTT_CALLBACK_SIGNATURE;
+   uint16_t readPacket(uint8_t*);
+   boolean readByte(uint8_t * result);
+   boolean readByte(uint8_t * result, uint16_t * index);
+   boolean write(uint8_t header, uint8_t* buf, uint16_t length);
+   uint16_t writeString(const char* string, uint8_t* buf, uint16_t pos);
+   IPAddress ip;
+   const char* domain;
+   uint16_t port;
+   Stream* stream;
+   int _state;
+public:
+   PubSubClient();
+   PubSubClient(Client& client);
+   PubSubClient(IPAddress, uint16_t, Client& client);
+   PubSubClient(IPAddress, uint16_t, Client& client, Stream&);
+   PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
+   PubSubClient(IPAddress, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
+   PubSubClient(uint8_t *, uint16_t, Client& client);
+   PubSubClient(uint8_t *, uint16_t, Client& client, Stream&);
+   PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
+   PubSubClient(uint8_t *, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
+   PubSubClient(const char*, uint16_t, Client& client);
+   PubSubClient(const char*, uint16_t, Client& client, Stream&);
+   PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client);
+   PubSubClient(const char*, uint16_t, MQTT_CALLBACK_SIGNATURE,Client& client, Stream&);
+
+   PubSubClient& setServer(IPAddress ip, uint16_t port);
+   PubSubClient& setServer(uint8_t * ip, uint16_t port);
+   PubSubClient& setServer(const char * domain, uint16_t port);
+   PubSubClient& setCallback(MQTT_CALLBACK_SIGNATURE);
+   PubSubClient& setClient(Client& client);
+   PubSubClient& setStream(Stream& stream);
+
+   boolean connect(const char* id);
+   boolean connect(const char* id, const char* user, const char* pass);
+   boolean connect(const char* id, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
+   boolean connect(const char* id, const char* user, const char* pass, const char* willTopic, uint8_t willQos, boolean willRetain, const char* willMessage);
+   void disconnect();
+   boolean publish(const char* topic, const char* payload);
+   boolean publish(const char* topic, const char* payload, boolean retained);
+   boolean publish(const char* topic, const uint8_t * payload, unsigned int plength);
+   boolean publish(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
+   boolean publish_P(const char* topic, const uint8_t * payload, unsigned int plength, boolean retained);
+   boolean subscribe(const char* topic);
+   boolean subscribe(const char* topic, uint8_t qos);
+   boolean unsubscribe(const char* topic);
+   boolean loop();
+   boolean connected();
+   int state();
+};
+
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/.gitignore b/libraries/pubsubclient-master/tests/.gitignore
new file mode 100644
index 0000000..215de78
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/.gitignore
@@ -0,0 +1,4 @@
+.build
+tmpbin
+logs
+*.pyc
diff --git a/libraries/pubsubclient-master/tests/Makefile b/libraries/pubsubclient-master/tests/Makefile
new file mode 100644
index 0000000..1f71636
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/Makefile
@@ -0,0 +1,25 @@
+SRC_PATH=./src
+OUT_PATH=./bin
+TEST_SRC=$(wildcard ${SRC_PATH}/*_spec.cpp)
+TEST_BIN= $(TEST_SRC:${SRC_PATH}/%.cpp=${OUT_PATH}/%)
+VPATH=${SRC_PATH}
+SHIM_FILES=${SRC_PATH}/lib/*.cpp
+PSC_FILE=../src/PubSubClient.cpp
+CC=g++
+CFLAGS=-I${SRC_PATH}/lib -I../src
+
+all: $(TEST_BIN)
+
+${OUT_PATH}/%: ${SRC_PATH}/%.cpp ${PSC_FILE} ${SHIM_FILES}
+	mkdir -p ${OUT_PATH}
+	${CC} ${CFLAGS} $^ -o $@
+
+clean:
+	@rm -rf ${OUT_PATH}
+
+test:
+	@bin/connect_spec
+	@bin/publish_spec
+	@bin/receive_spec
+	@bin/subscribe_spec
+	@bin/keepalive_spec
diff --git a/libraries/pubsubclient-master/tests/README.md b/libraries/pubsubclient-master/tests/README.md
new file mode 100644
index 0000000..e5700a6
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/README.md
@@ -0,0 +1,93 @@
+# Arduino Client for MQTT Test Suite
+
+This is a regression test suite for the `PubSubClient` library.
+
+There are two parts:
+
+ - Tests that can be compiled and run on any machine
+ - Tests that build the example sketches using the Arduino IDE
+
+
+It is a work-in-progress and is subject to complete refactoring as the whim takes
+me.
+
+
+## Local tests
+
+These are a set of executables that can be run to test specific areas of functionality.
+They do not require a real Arduino to be attached, nor the use of the Arduino IDE.
+
+The tests include a set of mock files to stub out the parts of the Arduino environment the library
+depends on.
+
+### Dependencies
+
+ - g++
+
+### Running
+
+Build the tests using the provided `Makefile`:
+
+    $ make
+
+This will create a set of executables in `./bin/`. Run each of these executables to test the corresponding functionality. 
+
+*Note:* the `connect_spec` and `keepalive_spec` tests involve testing keepalive timers so naturally take a few minutes to run through.
+
+## Arduino tests
+
+*Note:* INO Tool doesn't currently play nicely with Arduino 1.5. This has broken this test suite. 
+
+Without a suitable arduino plugged in, the test suite will only check the
+example sketches compile cleanly against the library.
+
+With an arduino plugged in, each sketch that has a corresponding python
+test case is built, uploaded and then the tests run.
+
+### Dependencies
+
+ - Python 2.7+
+ - [INO Tool](http://inotool.org/) - this provides command-line build/upload of Arduino sketches
+
+### Running
+
+The test suite _does not_ run an MQTT server - it is assumed to be running already.
+ 
+    $ python testsuite.py
+
+A summary of activity is printed to the console. More comprehensive logs are written
+to the `logs` directory.
+
+### What it does
+
+For each sketch in the library's `examples` directory, e.g. `mqtt_basic.ino`, the suite looks for a matching test case
+`testcases/mqtt_basic.py`.
+
+The test case must follow these conventions:
+ - sub-class `unittest.TestCase`
+ - provide the class methods `setUpClass` and `tearDownClass` (TODO: make this optional)
+ - all test method names begin with `test_`
+ 
+The suite will call the `setUpClass` method _before_ uploading the sketch. This
+allows any test setup to be performed before the sketch runs - such as connecting
+a client and subscribing to topics.
+
+
+### Settings
+
+The file `testcases/settings.py` is used to config the test environment.
+
+ - `server_ip` - the IP address of the broker the client should connect to (the broker port is assumed to be 1883).
+ - `arduino_ip` - the IP address the arduino should use (when not testing DHCP).
+
+Before each sketch is compiled, these values are automatically substituted in. To
+do this, the suite looks for lines that _start_ with the following:
+
+     byte server[] = {
+     byte ip[] = {
+
+and replaces them with the appropriate values.
+
+
+
+
diff --git a/libraries/pubsubclient-master/tests/src/connect_spec.cpp b/libraries/pubsubclient-master/tests/src/connect_spec.cpp
new file mode 100644
index 0000000..69f1864
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/connect_spec.cpp
@@ -0,0 +1,256 @@
+#include "PubSubClient.h"
+#include "ShimClient.h"
+#include "Buffer.h"
+#include "BDDTest.h"
+#include "trace.h"
+
+
+byte server[] = { 172, 16, 0, 2 };
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  // handle message arrived
+}
+
+
+int test_connect_fails_no_network() {
+    IT("fails to connect if underlying client doesn't connect");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(false);
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_FALSE(rc);
+    int state = client.state();
+    IS_TRUE(state == MQTT_CONNECT_FAILED);
+    END_IT
+}
+
+int test_connect_fails_on_no_response() {
+    IT("fails to connect if no response received after 15 seconds");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_FALSE(rc);
+    int state = client.state();
+    IS_TRUE(state == MQTT_CONNECTION_TIMEOUT);
+    END_IT
+}
+
+int test_connect_properly_formatted() {
+    IT("sends a properly formatted connect packet and succeeds");
+    ShimClient shimClient;
+
+    shimClient.setAllowConnect(true);
+    byte expectServer[] = { 172, 16, 0, 2 };
+    shimClient.expectConnect(expectServer,1883);
+    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+
+    shimClient.expect(connect,26);
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int state = client.state();
+    IS_TRUE(state == MQTT_DISCONNECTED);
+
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    state = client.state();
+    IS_TRUE(state == MQTT_CONNECTED);
+
+    END_IT
+}
+
+int test_connect_properly_formatted_hostname() {
+    IT("accepts a hostname");
+    ShimClient shimClient;
+
+    shimClient.setAllowConnect(true);
+    shimClient.expectConnect((char* const)"localhost",1883);
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client((char* const)"localhost", 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+
+int test_connect_fails_on_bad_rc() {
+    IT("fails to connect if a bad return code is received");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+    byte connack[] = { 0x20, 0x02, 0x00, 0x01 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_FALSE(rc);
+
+    int state = client.state();
+    IS_TRUE(state == 0x01);
+
+    END_IT
+}
+
+int test_connect_accepts_username_password() {
+    IT("accepts a username and password");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connect[] = { 0x10,0x24,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xc2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x4,0x70,0x61,0x73,0x73};
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.expect(connect,0x26);
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"pass");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_connect_accepts_username_no_password() {
+    IT("accepts a username but no password");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connect[] = { 0x10,0x1e,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x82,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x4,0x75,0x73,0x65,0x72};
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.expect(connect,0x20);
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1",(char*)"user",0);
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_connect_ignores_password_no_username() {
+    IT("ignores a password but no username");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.expect(connect,26);
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1",0,(char*)"pass");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_connect_with_will() {
+    IT("accepts a will");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connect[] = {0x10,0x30,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xe,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65};
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.expect(connect,0x32);
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1",(char*)"willTopic",1,0,(char*)"willMessage");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_connect_with_will_username_password() {
+    IT("accepts a will, username and password");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connect[] = {0x10,0x40,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0xce,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31,0x0,0x9,0x77,0x69,0x6c,0x6c,0x54,0x6f,0x70,0x69,0x63,0x0,0xb,0x77,0x69,0x6c,0x6c,0x4d,0x65,0x73,0x73,0x61,0x67,0x65,0x0,0x4,0x75,0x73,0x65,0x72,0x0,0x8,0x70,0x61,0x73,0x73,0x77,0x6f,0x72,0x64};
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.expect(connect,0x42);
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1",(char*)"user",(char*)"password",(char*)"willTopic",1,0,(char*)"willMessage");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_connect_disconnect_connect() {
+    IT("connects, disconnects and connects again");
+    ShimClient shimClient;
+
+    shimClient.setAllowConnect(true);
+    byte expectServer[] = { 172, 16, 0, 2 };
+    shimClient.expectConnect(expectServer,1883);
+    byte connect[] = {0x10,0x18,0x0,0x4,0x4d,0x51,0x54,0x54,0x4,0x2,0x0,0xf,0x0,0xc,0x63,0x6c,0x69,0x65,0x6e,0x74,0x5f,0x74,0x65,0x73,0x74,0x31};
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+
+    shimClient.expect(connect,26);
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+
+    int state = client.state();
+    IS_TRUE(state == MQTT_DISCONNECTED);
+
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+
+    state = client.state();
+    IS_TRUE(state == MQTT_CONNECTED);
+
+    byte disconnect[] = {0xE0,0x00};
+    shimClient.expect(disconnect,2);
+
+    client.disconnect();
+
+    IS_FALSE(client.connected());
+    IS_FALSE(shimClient.connected());
+    IS_FALSE(shimClient.error());
+
+    state = client.state();
+    IS_TRUE(state == MQTT_DISCONNECTED);
+
+    shimClient.expect(connect,28);
+    shimClient.respond(connack,4);
+    rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+    IS_FALSE(shimClient.error());
+    state = client.state();
+    IS_TRUE(state == MQTT_CONNECTED);
+
+    END_IT
+}
+
+int main()
+{
+    SUITE("Connect");
+    test_connect_fails_no_network();
+    test_connect_fails_on_no_response();
+
+    test_connect_properly_formatted();
+    test_connect_accepts_username_password();
+    test_connect_fails_on_bad_rc();
+    test_connect_properly_formatted_hostname();
+
+    test_connect_accepts_username_no_password();
+    test_connect_ignores_password_no_username();
+    test_connect_with_will();
+    test_connect_with_will_username_password();
+    test_connect_disconnect_connect();
+    FINISH
+}
diff --git a/libraries/pubsubclient-master/tests/src/keepalive_spec.cpp b/libraries/pubsubclient-master/tests/src/keepalive_spec.cpp
new file mode 100644
index 0000000..ea643cf
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/keepalive_spec.cpp
@@ -0,0 +1,185 @@
+#include "PubSubClient.h"
+#include "ShimClient.h"
+#include "Buffer.h"
+#include "BDDTest.h"
+#include "trace.h"
+#include <unistd.h>
+
+byte server[] = { 172, 16, 0, 2 };
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  // handle message arrived
+}
+
+
+int test_keepalive_pings_idle() {
+    IT("keeps an idle connection alive (takes 1 minute)");
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte pingreq[] = { 0xC0,0x0 };
+    shimClient.expect(pingreq,2);
+    byte pingresp[] = { 0xD0,0x0 };
+    shimClient.respond(pingresp,2);
+
+    for (int i = 0; i < 50; i++) {
+        sleep(1);
+        if ( i == 15 || i == 31 || i == 47) {
+            shimClient.expect(pingreq,2);
+            shimClient.respond(pingresp,2);
+        }
+        rc = client.loop();
+        IS_TRUE(rc);
+    }
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_keepalive_pings_with_outbound_qos0() {
+    IT("keeps a connection alive that only sends qos0 (takes 1 minute)");
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+
+    for (int i = 0; i < 50; i++) {
+        TRACE(i<<":");
+        shimClient.expect(publish,16);
+        rc = client.publish((char*)"topic",(char*)"payload");
+        IS_TRUE(rc);
+        IS_FALSE(shimClient.error());
+        sleep(1);
+        if ( i == 15 || i == 31 || i == 47) {
+            byte pingreq[] = { 0xC0,0x0 };
+            shimClient.expect(pingreq,2);
+            byte pingresp[] = { 0xD0,0x0 };
+            shimClient.respond(pingresp,2);
+        }
+        rc = client.loop();
+        IS_TRUE(rc);
+        IS_FALSE(shimClient.error());
+    }
+
+    END_IT
+}
+
+int test_keepalive_pings_with_inbound_qos0() {
+    IT("keeps a connection alive that only receives qos0 (takes 1 minute)");
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+
+    for (int i = 0; i < 50; i++) {
+        TRACE(i<<":");
+        sleep(1);
+        if ( i == 15 || i == 31 || i == 47) {
+            byte pingreq[] = { 0xC0,0x0 };
+            shimClient.expect(pingreq,2);
+            byte pingresp[] = { 0xD0,0x0 };
+            shimClient.respond(pingresp,2);
+        }
+        shimClient.respond(publish,16);
+        rc = client.loop();
+        IS_TRUE(rc);
+        IS_FALSE(shimClient.error());
+    }
+
+    END_IT
+}
+
+int test_keepalive_no_pings_inbound_qos1() {
+    IT("does not send pings for connections with inbound qos1 (takes 1 minute)");
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    byte puback[] = {0x40,0x2,0x12,0x34};
+
+    for (int i = 0; i < 50; i++) {
+        shimClient.respond(publish,18);
+        shimClient.expect(puback,4);
+        sleep(1);
+        rc = client.loop();
+        IS_TRUE(rc);
+        IS_FALSE(shimClient.error());
+    }
+
+    END_IT
+}
+
+int test_keepalive_disconnects_hung() {
+    IT("disconnects a hung connection (takes 30 seconds)");
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte pingreq[] = { 0xC0,0x0 };
+    shimClient.expect(pingreq,2);
+
+    for (int i = 0; i < 32; i++) {
+        sleep(1);
+        rc = client.loop();
+    }
+    IS_FALSE(rc);
+
+    int state = client.state();
+    IS_TRUE(state == MQTT_CONNECTION_TIMEOUT);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int main()
+{
+    SUITE("Keep-alive");
+    test_keepalive_pings_idle();
+    test_keepalive_pings_with_outbound_qos0();
+    test_keepalive_pings_with_inbound_qos0();
+    test_keepalive_no_pings_inbound_qos1();
+    test_keepalive_disconnects_hung();
+
+    FINISH
+}
diff --git a/libraries/pubsubclient-master/tests/src/lib/Arduino.h b/libraries/pubsubclient-master/tests/src/lib/Arduino.h
new file mode 100644
index 0000000..c675280
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/Arduino.h
@@ -0,0 +1,23 @@
+#ifndef Arduino_h
+#define Arduino_h
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+
+extern "C"{
+    typedef uint8_t byte ;
+    typedef uint8_t boolean ;
+
+    /* sketch */
+    extern void setup( void ) ;
+    extern void loop( void ) ;
+    uint32_t millis( void );
+}
+
+#define PROGMEM
+#define pgm_read_byte_near(x) *(x)
+
+#endif // Arduino_h
diff --git a/libraries/pubsubclient-master/tests/src/lib/BDDTest.cpp b/libraries/pubsubclient-master/tests/src/lib/BDDTest.cpp
new file mode 100644
index 0000000..a72bf65
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/BDDTest.cpp
@@ -0,0 +1,50 @@
+#include "BDDTest.h"
+#include "trace.h"
+#include <sstream>
+#include <iostream>
+#include <string>
+#include <list>
+
+int testCount = 0;
+int testPasses = 0;
+const char* testDescription;
+
+std::list<std::string> failureList;
+
+void bddtest_suite(const char* name) {
+    LOG(name << "\n");
+}
+
+int bddtest_test(const char* file, int line, const char* assertion, int result) {
+    if (!result) {
+        LOG("✗\n");
+        std::ostringstream os;
+        os << "   ! "<<testDescription<<"\n      " <<file << ":" <<line<<" : "<<assertion<<" ["<<result<<"]";
+        failureList.push_back(os.str());
+    }
+    return result;
+}
+
+void bddtest_start(const char* description) {
+    LOG(" - "<<description<<" ");
+    testDescription = description;
+    testCount ++;
+}
+void bddtest_end() {
+    LOG("✓\n");
+    testPasses ++;
+}
+
+int bddtest_summary() {
+    for (std::list<std::string>::iterator it = failureList.begin(); it != failureList.end(); it++) {
+        LOG("\n");
+        LOG(*it);
+        LOG("\n");
+    }
+
+    LOG(std::dec << testPasses << "/" << testCount << " tests passed\n\n");
+    if (testPasses == testCount) {
+        return 0;
+    }
+    return 1;
+}
diff --git a/libraries/pubsubclient-master/tests/src/lib/BDDTest.h b/libraries/pubsubclient-master/tests/src/lib/BDDTest.h
new file mode 100644
index 0000000..1197fdd
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/BDDTest.h
@@ -0,0 +1,23 @@
+#ifndef bddtest_h
+#define bddtest_h
+
+void bddtest_suite(const char* name);
+int bddtest_test(const char*, int, const char*, int);
+void bddtest_start(const char*);
+void bddtest_end();
+int bddtest_summary();
+
+#define SUITE(x) { bddtest_suite(x); }
+#define TEST(x) { if (!bddtest_test(__FILE__, __LINE__, #x, (x))) return false;  }
+
+#define IT(x) { bddtest_start(x); }
+#define END_IT { bddtest_end();return true;}
+
+#define FINISH { return bddtest_summary(); }
+
+#define IS_TRUE(x) TEST(x)
+#define IS_FALSE(x) TEST(!(x))
+#define IS_EQUAL(x,y) TEST(x==y)
+#define IS_NOT_EQUAL(x,y) TEST(x!=y)
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/src/lib/Buffer.cpp b/libraries/pubsubclient-master/tests/src/lib/Buffer.cpp
new file mode 100644
index 0000000..59a2fbb
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/Buffer.cpp
@@ -0,0 +1,30 @@
+#include "Buffer.h"
+#include "Arduino.h"
+
+Buffer::Buffer() {
+}
+
+Buffer::Buffer(uint8_t* buf, size_t size) {
+    this->add(buf,size);
+}
+bool Buffer::available() {
+    return this->pos < this->length;
+}
+
+uint8_t Buffer::next() {
+    if (this->available()) {
+        return this->buffer[this->pos++];
+    }
+    return 0;
+}
+
+void Buffer::reset() {
+    this->pos = 0;
+}
+
+void Buffer::add(uint8_t* buf, size_t size) {
+    uint16_t i = 0;
+    for (;i<size;i++) {
+        this->buffer[this->length++] = buf[i];
+    }
+}
diff --git a/libraries/pubsubclient-master/tests/src/lib/Buffer.h b/libraries/pubsubclient-master/tests/src/lib/Buffer.h
new file mode 100644
index 0000000..f448cad
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/Buffer.h
@@ -0,0 +1,23 @@
+#ifndef buffer_h
+#define buffer_h
+
+#include "Arduino.h"
+
+class Buffer {
+private:
+    uint8_t buffer[1024];
+    uint16_t pos;
+    uint16_t length;
+    
+public:
+    Buffer();
+    Buffer(uint8_t* buf, size_t size);
+    
+    virtual bool available();
+    virtual uint8_t next();
+    virtual void reset();
+    
+    virtual void add(uint8_t* buf, size_t size);
+};
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/src/lib/Client.h b/libraries/pubsubclient-master/tests/src/lib/Client.h
new file mode 100644
index 0000000..9e18c07
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/Client.h
@@ -0,0 +1,21 @@
+#ifndef client_h
+#define client_h
+#include "IPAddress.h"
+
+class Client {
+public:
+  virtual int connect(IPAddress ip, uint16_t port) =0;
+  virtual int connect(const char *host, uint16_t port) =0;
+  virtual size_t write(uint8_t) =0;
+  virtual size_t write(const uint8_t *buf, size_t size) =0;
+  virtual int available() = 0;
+  virtual int read() = 0;
+  virtual int read(uint8_t *buf, size_t size) = 0;
+  virtual int peek() = 0;
+  virtual void flush() = 0;
+  virtual void stop() = 0;
+  virtual uint8_t connected() = 0;
+  virtual operator bool() = 0;
+};
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/src/lib/IPAddress.cpp b/libraries/pubsubclient-master/tests/src/lib/IPAddress.cpp
new file mode 100644
index 0000000..610ff4c
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/IPAddress.cpp
@@ -0,0 +1,44 @@
+
+#include <Arduino.h>
+#include <IPAddress.h>
+
+IPAddress::IPAddress()
+{
+    memset(_address, 0, sizeof(_address));
+}
+
+IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
+{
+    _address[0] = first_octet;
+    _address[1] = second_octet;
+    _address[2] = third_octet;
+    _address[3] = fourth_octet;
+}
+
+IPAddress::IPAddress(uint32_t address)
+{
+    memcpy(_address, &address, sizeof(_address));
+}
+
+IPAddress::IPAddress(const uint8_t *address)
+{
+    memcpy(_address, address, sizeof(_address));
+}
+
+IPAddress& IPAddress::operator=(const uint8_t *address)
+{
+    memcpy(_address, address, sizeof(_address));
+    return *this;
+}
+
+IPAddress& IPAddress::operator=(uint32_t address)
+{
+    memcpy(_address, (const uint8_t *)&address, sizeof(_address));
+    return *this;
+}
+
+bool IPAddress::operator==(const uint8_t* addr)
+{
+    return memcmp(addr, _address, sizeof(_address)) == 0;
+}
+
diff --git a/libraries/pubsubclient-master/tests/src/lib/IPAddress.h b/libraries/pubsubclient-master/tests/src/lib/IPAddress.h
new file mode 100644
index 0000000..e75a8fe
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/IPAddress.h
@@ -0,0 +1,72 @@
+/*
+ *
+ * MIT License:
+ * Copyright (c) 2011 Adrian McEwen
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * adrianm@mcqn.com 1/1/2011
+ */
+
+#ifndef IPAddress_h
+#define IPAddress_h
+
+
+// A class to make it easier to handle and pass around IP addresses
+
+class IPAddress {
+private:
+    uint8_t _address[4];  // IPv4 address
+    // Access the raw byte array containing the address.  Because this returns a pointer
+    // to the internal structure rather than a copy of the address this function should only
+    // be used when you know that the usage of the returned uint8_t* will be transient and not
+    // stored.
+    uint8_t* raw_address() { return _address; };
+
+public:
+    // Constructors
+    IPAddress();
+    IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet);
+    IPAddress(uint32_t address);
+    IPAddress(const uint8_t *address);
+
+    // Overloaded cast operator to allow IPAddress objects to be used where a pointer
+    // to a four-byte uint8_t array is expected
+    operator uint32_t() { return *((uint32_t*)_address); };
+    bool operator==(const IPAddress& addr) { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
+    bool operator==(const uint8_t* addr);
+
+    // Overloaded index operator to allow getting and setting individual octets of the address
+    uint8_t operator[](int index) const { return _address[index]; };
+    uint8_t& operator[](int index) { return _address[index]; };
+
+    // Overloaded copy operators to allow initialisation of IPAddress objects from other types
+    IPAddress& operator=(const uint8_t *address);
+    IPAddress& operator=(uint32_t address);
+
+
+    friend class EthernetClass;
+    friend class UDP;
+    friend class Client;
+    friend class Server;
+    friend class DhcpClass;
+    friend class DNSClient;
+};
+
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/src/lib/ShimClient.cpp b/libraries/pubsubclient-master/tests/src/lib/ShimClient.cpp
new file mode 100644
index 0000000..f70115f
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/ShimClient.cpp
@@ -0,0 +1,153 @@
+#include "ShimClient.h"
+#include "trace.h"
+#include <iostream>
+#include <Arduino.h>
+#include <ctime>
+
+extern "C" {
+    uint32_t millis(void) {
+       return time(0)*1000;
+    }
+}
+
+ShimClient::ShimClient() {
+    this->responseBuffer = new Buffer();
+    this->expectBuffer = new Buffer();
+    this->_allowConnect = true;
+    this->_connected = false;
+    this->_error = false;
+    this->expectAnything = true;
+    this->_received = 0;
+    this->_expectedPort = 0;
+}
+
+int ShimClient::connect(IPAddress ip, uint16_t port) {
+    if (this->_allowConnect) {
+        this->_connected = true;
+    }
+    if (this->_expectedPort !=0) {
+        // if (memcmp(ip,this->_expectedIP,4) != 0) {
+        //     TRACE( "ip mismatch\n");
+        //     this->_error = true;
+        // }
+        if (port != this->_expectedPort) {
+            TRACE( "port mismatch\n");
+            this->_error = true;
+        }
+    }
+    return this->_connected;
+}
+int ShimClient::connect(const char *host, uint16_t port)  {
+    if (this->_allowConnect) {
+        this->_connected = true;
+    }
+    if (this->_expectedPort !=0) {
+        if (strcmp(host,this->_expectedHost) != 0) {
+            TRACE( "host mismatch\n");
+            this->_error = true;
+        }
+        if (port != this->_expectedPort) {
+            TRACE( "port mismatch\n");
+            this->_error = true;
+        }
+
+    }
+    return this->_connected;
+}
+size_t ShimClient::write(uint8_t b)  {
+    this->_received += 1;
+    TRACE(std::hex << (unsigned int)b);
+    if (!this->expectAnything) {
+        if (this->expectBuffer->available()) {
+            uint8_t expected = this->expectBuffer->next();
+            if (expected != b) {
+                this->_error = true;
+                TRACE("!=" << (unsigned int)expected);
+            }
+        } else {
+            this->_error = true;
+        }
+    }
+    TRACE("\n"<< std::dec);
+    return 1;
+}
+size_t ShimClient::write(const uint8_t *buf, size_t size)  {
+    this->_received += size;
+    TRACE( "[" << std::dec << (unsigned int)(size) << "] ");
+    uint16_t i=0;
+    for (;i<size;i++) {
+        if (i>0) {
+            TRACE(":");
+        }
+        TRACE(std::hex << (unsigned int)(buf[i]));
+
+        if (!this->expectAnything) {
+            if (this->expectBuffer->available()) {
+                uint8_t expected = this->expectBuffer->next();
+                if (expected != buf[i]) {
+                    this->_error = true;
+                    TRACE("!=" << (unsigned int)expected);
+                }
+            } else {
+                this->_error = true;
+            }
+        }
+    }
+    TRACE("\n"<<std::dec);
+    return size;
+}
+int ShimClient::available()  {
+    return this->responseBuffer->available();
+}
+int ShimClient::read()  { return this->responseBuffer->next(); }
+int ShimClient::read(uint8_t *buf, size_t size) {
+    uint16_t i = 0;
+    for (;i<size;i++) {
+        buf[i] = this->read();
+    }
+    return size;
+}
+int ShimClient::peek()  { return 0; }
+void ShimClient::flush() {}
+void ShimClient::stop() {
+    this->setConnected(false);
+}
+uint8_t ShimClient::connected() { return this->_connected; }
+ShimClient::operator bool() { return true; }
+
+
+ShimClient* ShimClient::respond(uint8_t *buf, size_t size) {
+    this->responseBuffer->add(buf,size);
+    return this;
+}
+
+ShimClient* ShimClient::expect(uint8_t *buf, size_t size) {
+    this->expectAnything = false;
+    this->expectBuffer->add(buf,size);
+    return this;
+}
+
+void ShimClient::setConnected(bool b) {
+    this->_connected = b;
+}
+void ShimClient::setAllowConnect(bool b) {
+    this->_allowConnect = b;
+}
+
+bool ShimClient::error() {
+    return this->_error;
+}
+
+uint16_t ShimClient::received() {
+    return this->_received;
+}
+
+void ShimClient::expectConnect(IPAddress ip, uint16_t port) {
+    this->_expectedIP = ip;
+    this->_expectedPort = port;
+}
+
+void ShimClient::expectConnect(const char *host, uint16_t port) {
+    this->_expectedHost = host;
+    this->_expectedPort = port;
+}
diff --git a/libraries/pubsubclient-master/tests/src/lib/ShimClient.h b/libraries/pubsubclient-master/tests/src/lib/ShimClient.h
new file mode 100644
index 0000000..2e3f874
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/ShimClient.h
@@ -0,0 +1,51 @@
+#ifndef shimclient_h
+#define shimclient_h
+
+#include "Arduino.h"
+#include "Client.h"
+#include "IPAddress.h"
+#include "Buffer.h"
+
+
+class ShimClient : public Client {
+private:
+    Buffer* responseBuffer;
+    Buffer* expectBuffer;
+    bool _allowConnect;
+    bool _connected;
+    bool expectAnything;
+    bool _error;
+    uint16_t _received;
+    IPAddress _expectedIP;
+    uint16_t _expectedPort;
+    const char* _expectedHost;
+    
+public:
+  ShimClient();
+  virtual int connect(IPAddress ip, uint16_t port);
+  virtual int connect(const char *host, uint16_t port);
+  virtual size_t write(uint8_t);
+  virtual size_t write(const uint8_t *buf, size_t size);
+  virtual int available();
+  virtual int read();
+  virtual int read(uint8_t *buf, size_t size);
+  virtual int peek();
+  virtual void flush();
+  virtual void stop();
+  virtual uint8_t connected();
+  virtual operator bool();
+  
+  virtual ShimClient* respond(uint8_t *buf, size_t size);
+  virtual ShimClient* expect(uint8_t *buf, size_t size);
+  
+  virtual void expectConnect(IPAddress ip, uint16_t port);
+  virtual void expectConnect(const char *host, uint16_t port);
+  
+  virtual uint16_t received();
+  virtual bool error();
+  
+  virtual void setAllowConnect(bool b);
+  virtual void setConnected(bool b);
+};
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/src/lib/Stream.cpp b/libraries/pubsubclient-master/tests/src/lib/Stream.cpp
new file mode 100644
index 0000000..b0ecbb4
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/Stream.cpp
@@ -0,0 +1,39 @@
+#include "Stream.h"
+#include "trace.h"
+#include <iostream>
+#include <Arduino.h>
+
+Stream::Stream() {
+    this->expectBuffer = new Buffer();
+    this->_error = false;
+    this->_written = 0;
+}
+
+size_t Stream::write(uint8_t b)  {
+    this->_written++;
+    TRACE(std::hex << (unsigned int)b);
+    if (this->expectBuffer->available()) {
+        uint8_t expected = this->expectBuffer->next();
+        if (expected != b) {
+            this->_error = true;
+            TRACE("!=" << (unsigned int)expected);
+        }
+    } else {
+        this->_error = true;
+    }
+    TRACE("\n"<< std::dec);
+    return 1;
+}
+
+
+bool Stream::error() {
+    return this->_error;
+}
+
+void Stream::expect(uint8_t *buf, size_t size) {
+    this->expectBuffer->add(buf,size);
+}
+
+uint16_t Stream::length() {
+    return this->_written;
+}
diff --git a/libraries/pubsubclient-master/tests/src/lib/Stream.h b/libraries/pubsubclient-master/tests/src/lib/Stream.h
new file mode 100644
index 0000000..4e41f86
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/Stream.h
@@ -0,0 +1,22 @@
+#ifndef Stream_h
+#define Stream_h
+
+#include "Arduino.h"
+#include "Buffer.h"
+
+class Stream {
+private:
+    Buffer* expectBuffer;
+    bool _error;
+    uint16_t _written;
+
+public:
+    Stream();
+    virtual size_t write(uint8_t);
+    
+    virtual bool error();
+    virtual void expect(uint8_t *buf, size_t size);
+    virtual uint16_t length();
+};
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/src/lib/trace.h b/libraries/pubsubclient-master/tests/src/lib/trace.h
new file mode 100644
index 0000000..42eb991
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/lib/trace.h
@@ -0,0 +1,10 @@
+#ifndef trace_h
+#define trace_h
+#include <iostream>
+
+#include <stdlib.h>
+
+#define LOG(x) {std::cout << x << std::flush; }
+#define TRACE(x) {if (getenv("TRACE")) { std::cout << x << std::flush; }}
+
+#endif
diff --git a/libraries/pubsubclient-master/tests/src/publish_spec.cpp b/libraries/pubsubclient-master/tests/src/publish_spec.cpp
new file mode 100644
index 0000000..232df0d
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/publish_spec.cpp
@@ -0,0 +1,190 @@
+#include "PubSubClient.h"
+#include "ShimClient.h"
+#include "Buffer.h"
+#include "BDDTest.h"
+#include "trace.h"
+
+
+byte server[] = { 172, 16, 0, 2 };
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  // handle message arrived
+}
+
+int test_publish() {
+    IT("publishes a null-terminated string");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    shimClient.expect(publish,16);
+
+    rc = client.publish((char*)"topic",(char*)"payload");
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+
+int test_publish_bytes() {
+    IT("publishes a byte array");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
+    int length = 5;
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x30,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
+    shimClient.expect(publish,14);
+
+    rc = client.publish((char*)"topic",payload,length);
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+
+int test_publish_retained() {
+    IT("publishes retained - 1");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
+    int length = 5;
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
+    shimClient.expect(publish,14);
+
+    rc = client.publish((char*)"topic",payload,length,true);
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_publish_retained_2() {
+    IT("publishes retained - 2");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,'A','B','C','D','E'};
+    shimClient.expect(publish,14);
+
+    rc = client.publish((char*)"topic",(char*)"ABCDE",true);
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_publish_not_connected() {
+    IT("publish fails when not connected");
+    ShimClient shimClient;
+
+    PubSubClient client(server, 1883, callback, shimClient);
+
+    int rc = client.publish((char*)"topic",(char*)"payload");
+    IS_FALSE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_publish_too_long() {
+    IT("publish fails when topic/payload are too long");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    //                                         0        1         2         3         4         5         6         7         8         9         0         1         2
+    rc = client.publish((char*)"topic",(char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+    IS_FALSE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_publish_P() {
+    IT("publishes using PROGMEM");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
+    int length = 5;
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
+    shimClient.expect(publish,14);
+
+    rc = client.publish_P((char*)"topic",payload,length,true);
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+
+
+
+int main()
+{
+    SUITE("Publish");
+    test_publish();
+    test_publish_bytes();
+    test_publish_retained();
+    test_publish_retained_2();
+    test_publish_not_connected();
+    test_publish_too_long();
+    test_publish_P();
+
+    FINISH
+}
diff --git a/libraries/pubsubclient-master/tests/src/receive_spec.cpp b/libraries/pubsubclient-master/tests/src/receive_spec.cpp
new file mode 100644
index 0000000..54a62ee
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/receive_spec.cpp
@@ -0,0 +1,249 @@
+#include "PubSubClient.h"
+#include "ShimClient.h"
+#include "Buffer.h"
+#include "BDDTest.h"
+#include "trace.h"
+
+
+byte server[] = { 172, 16, 0, 2 };
+
+bool callback_called = false;
+char lastTopic[1024];
+char lastPayload[1024];
+unsigned int lastLength;
+
+void reset_callback() {
+    callback_called = false;
+    lastTopic[0] = '\0';
+    lastPayload[0] = '\0';
+    lastLength = 0;
+}
+
+void callback(char* topic, byte* payload, unsigned int length) {
+    callback_called = true;
+    strcpy(lastTopic,topic);
+    memcpy(lastPayload,payload,length);
+    lastLength = length;
+}
+
+int test_receive_callback() {
+    IT("receives a callback message");
+    reset_callback();
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    shimClient.respond(publish,16);
+
+    rc = client.loop();
+
+    IS_TRUE(rc);
+
+    IS_TRUE(callback_called);
+    IS_TRUE(strcmp(lastTopic,"topic")==0);
+    IS_TRUE(memcmp(lastPayload,"payload",7)==0);
+    IS_TRUE(lastLength == 7);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_receive_stream() {
+    IT("receives a streamed callback message");
+    reset_callback();
+
+    Stream stream;
+    stream.expect((uint8_t*)"payload",7);
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient, stream);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    shimClient.respond(publish,16);
+
+    rc = client.loop();
+
+    IS_TRUE(rc);
+
+    IS_TRUE(callback_called);
+    IS_TRUE(strcmp(lastTopic,"topic")==0);
+    IS_TRUE(lastLength == 7);
+
+    IS_FALSE(stream.error());
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_receive_max_sized_message() {
+    IT("receives an max-sized message");
+    reset_callback();
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    int length = MQTT_MAX_PACKET_SIZE;
+    byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    byte bigPublish[length];
+    memset(bigPublish,'A',length);
+    bigPublish[length] = 'B';
+    memcpy(bigPublish,publish,16);
+    shimClient.respond(bigPublish,length);
+
+    rc = client.loop();
+
+    IS_TRUE(rc);
+
+    IS_TRUE(callback_called);
+    IS_TRUE(strcmp(lastTopic,"topic")==0);
+    IS_TRUE(lastLength == length-9);
+    IS_TRUE(memcmp(lastPayload,bigPublish+9,lastLength)==0);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_receive_oversized_message() {
+    IT("drops an oversized message");
+    reset_callback();
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    int length = MQTT_MAX_PACKET_SIZE+1;
+    byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    byte bigPublish[length];
+    memset(bigPublish,'A',length);
+    bigPublish[length] = 'B';
+    memcpy(bigPublish,publish,16);
+    shimClient.respond(bigPublish,length);
+
+    rc = client.loop();
+
+    IS_TRUE(rc);
+
+    IS_FALSE(callback_called);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_receive_oversized_stream_message() {
+    IT("drops an oversized message");
+    reset_callback();
+
+    Stream stream;
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient, stream);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    int length = MQTT_MAX_PACKET_SIZE+1;
+    byte publish[] = {0x30,length-2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+
+    byte bigPublish[length];
+    memset(bigPublish,'A',length);
+    bigPublish[length] = 'B';
+    memcpy(bigPublish,publish,16);
+
+    shimClient.respond(bigPublish,length);
+    stream.expect(bigPublish+9,length-9);
+
+    rc = client.loop();
+
+    IS_TRUE(rc);
+
+    IS_TRUE(callback_called);
+    IS_TRUE(strcmp(lastTopic,"topic")==0);
+    IS_TRUE(lastLength == length-9);
+
+    IS_FALSE(stream.error());
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_receive_qos1() {
+    IT("receives a qos1 message");
+    reset_callback();
+
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte publish[] = {0x32,0x10,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x12,0x34,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    shimClient.respond(publish,18);
+
+    byte puback[] = {0x40,0x2,0x12,0x34};
+    shimClient.expect(puback,4);
+
+    rc = client.loop();
+
+    IS_TRUE(rc);
+
+    IS_TRUE(callback_called);
+    IS_TRUE(strcmp(lastTopic,"topic")==0);
+    IS_TRUE(memcmp(lastPayload,"payload",7)==0);
+    IS_TRUE(lastLength == 7);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int main()
+{
+    SUITE("Receive");
+    test_receive_callback();
+    test_receive_stream();
+    test_receive_max_sized_message();
+    test_receive_oversized_message();
+    test_receive_oversized_stream_message();
+    test_receive_qos1();
+
+    FINISH
+}
diff --git a/libraries/pubsubclient-master/tests/src/subscribe_spec.cpp b/libraries/pubsubclient-master/tests/src/subscribe_spec.cpp
new file mode 100644
index 0000000..a419823
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/src/subscribe_spec.cpp
@@ -0,0 +1,177 @@
+#include "PubSubClient.h"
+#include "ShimClient.h"
+#include "Buffer.h"
+#include "BDDTest.h"
+#include "trace.h"
+
+
+byte server[] = { 172, 16, 0, 2 };
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  // handle message arrived
+}
+
+int test_subscribe_no_qos() {
+    IT("subscribe without qos defaults to 0");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x0 };
+    shimClient.expect(subscribe,12);
+    byte suback[] = { 0x90,0x3,0x0,0x2,0x0 };
+    shimClient.respond(suback,5);
+
+    rc = client.subscribe((char*)"topic");
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_subscribe_qos_1() {
+    IT("subscribes qos 1");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte subscribe[] = { 0x82,0xa,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1 };
+    shimClient.expect(subscribe,12);
+    byte suback[] = { 0x90,0x3,0x0,0x2,0x1 };
+    shimClient.respond(suback,5);
+
+    rc = client.subscribe((char*)"topic",1);
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_subscribe_not_connected() {
+    IT("subscribe fails when not connected");
+    ShimClient shimClient;
+
+    PubSubClient client(server, 1883, callback, shimClient);
+
+    int rc = client.subscribe((char*)"topic");
+    IS_FALSE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_subscribe_invalid_qos() {
+    IT("subscribe fails with invalid qos values");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    rc = client.subscribe((char*)"topic",2);
+    IS_FALSE(rc);
+    rc = client.subscribe((char*)"topic",254);
+    IS_FALSE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_subscribe_too_long() {
+    IT("subscribe fails with too long topic");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    // max length should be allowed
+    //                            0        1         2         3         4         5         6         7         8         9         0         1         2
+    rc = client.subscribe((char*)"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
+    IS_TRUE(rc);
+
+    //                            0        1         2         3         4         5         6         7         8         9         0         1         2
+    rc = client.subscribe((char*)"123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+    IS_FALSE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+
+int test_unsubscribe() {
+    IT("unsubscribes");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+
+    byte unsubscribe[] = { 0xA2,0x9,0x0,0x2,0x0,0x5,0x74,0x6f,0x70,0x69,0x63 };
+    shimClient.expect(unsubscribe,12);
+    byte unsuback[] = { 0xB0,0x2,0x0,0x2 };
+    shimClient.respond(unsuback,4);
+
+    rc = client.unsubscribe((char*)"topic");
+    IS_TRUE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_unsubscribe_not_connected() {
+    IT("unsubscribe fails when not connected");
+    ShimClient shimClient;
+
+    PubSubClient client(server, 1883, callback, shimClient);
+
+    int rc = client.unsubscribe((char*)"topic");
+    IS_FALSE(rc);
+
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int main()
+{
+    SUITE("Subscribe");
+    test_subscribe_no_qos();
+    test_subscribe_qos_1();
+    test_subscribe_not_connected();
+    test_subscribe_invalid_qos();
+    test_subscribe_too_long();
+    test_unsubscribe();
+    test_unsubscribe_not_connected();
+    FINISH
+}
diff --git a/libraries/pubsubclient-master/tests/testcases/__init__.py b/libraries/pubsubclient-master/tests/testcases/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/libraries/pubsubclient-master/tests/testcases/mqtt_basic.py b/libraries/pubsubclient-master/tests/testcases/mqtt_basic.py
new file mode 100644
index 0000000..1b0cc65
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/testcases/mqtt_basic.py
@@ -0,0 +1,43 @@
+import unittest
+import settings
+
+import time
+import mosquitto
+
+import serial
+
+def on_message(mosq, obj, msg):
+  obj.message_queue.append(msg)
+
+class mqtt_basic(unittest.TestCase):
+  
+  message_queue = []
+  
+  @classmethod
+  def setUpClass(self):
+    self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True,obj=self)
+    self.client.connect(settings.server_ip)
+    self.client.on_message = on_message
+    self.client.subscribe("outTopic",0)
+
+  @classmethod
+  def tearDownClass(self):
+    self.client.disconnect()
+  
+  def test_one(self):
+    i=30
+    while len(self.message_queue) == 0 and i > 0:
+      self.client.loop()
+      time.sleep(0.5)
+      i -= 1
+    self.assertTrue(i>0, "message receive timed-out")
+    self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
+    msg = self.message_queue[0]
+    self.assertEqual(msg.mid,0,"message id not 0")
+    self.assertEqual(msg.topic,"outTopic","message topic incorrect")
+    self.assertEqual(msg.payload,"hello world")
+    self.assertEqual(msg.qos,0,"message qos not 0")
+    self.assertEqual(msg.retain,False,"message retain flag incorrect")
+    
+    
+
diff --git a/libraries/pubsubclient-master/tests/testcases/mqtt_publish_in_callback.py b/libraries/pubsubclient-master/tests/testcases/mqtt_publish_in_callback.py
new file mode 100644
index 0000000..7989f7f
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/testcases/mqtt_publish_in_callback.py
@@ -0,0 +1,64 @@
+import unittest
+import settings
+
+import time
+import mosquitto
+
+import serial
+
+def on_message(mosq, obj, msg):
+  obj.message_queue.append(msg)
+
+class mqtt_publish_in_callback(unittest.TestCase):
+  
+  message_queue = []
+  
+  @classmethod
+  def setUpClass(self):
+    self.client = mosquitto.Mosquitto("pubsubclient_ut", clean_session=True,obj=self)
+    self.client.connect(settings.server_ip)
+    self.client.on_message = on_message
+    self.client.subscribe("outTopic",0)
+
+  @classmethod
+  def tearDownClass(self):
+    self.client.disconnect()
+  
+  def test_connect(self):
+    i=30
+    while len(self.message_queue) == 0 and i > 0:
+      self.client.loop()
+      time.sleep(0.5)
+      i -= 1
+    self.assertTrue(i>0, "message receive timed-out")
+    self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
+    msg = self.message_queue.pop(0)
+    self.assertEqual(msg.mid,0,"message id not 0")
+    self.assertEqual(msg.topic,"outTopic","message topic incorrect")
+    self.assertEqual(msg.payload,"hello world")
+    self.assertEqual(msg.qos,0,"message qos not 0")
+    self.assertEqual(msg.retain,False,"message retain flag incorrect")
+    
+
+  def test_publish(self):
+    self.assertEqual(len(self.message_queue), 0, "message queue not empty")
+    payload = "abcdefghij"
+    self.client.publish("inTopic",payload)
+    
+    i=30
+    while len(self.message_queue) == 0 and i > 0:
+      self.client.loop()
+      time.sleep(0.5)
+      i -= 1
+
+    self.assertTrue(i>0, "message receive timed-out")
+    self.assertEqual(len(self.message_queue), 1, "unexpected number of messages received")
+    msg = self.message_queue.pop(0)
+    self.assertEqual(msg.mid,0,"message id not 0")
+    self.assertEqual(msg.topic,"outTopic","message topic incorrect")
+    self.assertEqual(msg.payload,payload)
+    self.assertEqual(msg.qos,0,"message qos not 0")
+    self.assertEqual(msg.retain,False,"message retain flag incorrect")
+    
+
+
diff --git a/libraries/pubsubclient-master/tests/testcases/settings.py b/libraries/pubsubclient-master/tests/testcases/settings.py
new file mode 100644
index 0000000..4ad8719
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/testcases/settings.py
@@ -0,0 +1,2 @@
+server_ip = "172.16.0.2"
+arduino_ip = "172.16.0.100"
diff --git a/libraries/pubsubclient-master/tests/testsuite.py b/libraries/pubsubclient-master/tests/testsuite.py
new file mode 100644
index 0000000..0a8e70d
--- /dev/null
+++ b/libraries/pubsubclient-master/tests/testsuite.py
@@ -0,0 +1,179 @@
+#!/usr/bin/env python
+import os
+import os.path
+import sys
+import shutil
+from subprocess import call
+import importlib
+import unittest
+import re
+
+from testcases import settings
+
+class Workspace(object):
+  
+  def __init__(self):
+    self.root_dir = os.getcwd()
+    self.build_dir = os.path.join(self.root_dir,"tmpbin");
+    self.log_dir = os.path.join(self.root_dir,"logs");
+    self.tests_dir = os.path.join(self.root_dir,"testcases");
+    self.examples_dir = os.path.join(self.root_dir,"../PubSubClient/examples")
+    self.examples = []
+    self.tests = []
+    if not os.path.isdir("../PubSubClient"):
+      raise Exception("Cannot find PubSubClient library")
+    try:
+      import ino
+    except:
+      raise Exception("ino tool not installed")
+
+  def init(self):
+    if os.path.isdir(self.build_dir):
+      shutil.rmtree(self.build_dir)
+    os.mkdir(self.build_dir)
+    if os.path.isdir(self.log_dir):
+      shutil.rmtree(self.log_dir)
+    os.mkdir(self.log_dir)
+    
+    os.chdir(self.build_dir)
+    call(["ino","init"])
+    
+    shutil.copytree("../../PubSubClient","lib/PubSubClient")
+    
+    filenames = []
+    for root, dirs, files in os.walk(self.examples_dir):
+      filenames += [os.path.join(root,f) for f in files if f.endswith(".ino")]
+    filenames.sort()
+    for e in filenames:
+      self.examples.append(Sketch(self,e))
+    
+    filenames = []
+    for root, dirs, files in os.walk(self.tests_dir):
+      filenames += [os.path.join(root,f) for f in files if f.endswith(".ino")]
+    filenames.sort()
+    for e in filenames:
+      self.tests.append(Sketch(self,e))
+      
+  def clean(self):
+    shutil.rmtree(self.build_dir)
+  
+class Sketch(object):
+  def __init__(self,wksp,fn):
+    self.w = wksp
+    self.filename = fn
+    self.basename = os.path.basename(self.filename)
+    self.build_log = os.path.join(self.w.log_dir,"%s.log"%(os.path.basename(self.filename),))
+    self.build_err_log = os.path.join(self.w.log_dir,"%s.err.log"%(os.path.basename(self.filename),))
+    self.build_upload_log = os.path.join(self.w.log_dir,"%s.upload.log"%(os.path.basename(self.filename),))
+
+  def build(self):
+    sys.stdout.write(" Build:   ")
+    sys.stdout.flush()
+    
+    # Copy sketch over, replacing IP addresses as necessary
+    fin = open(self.filename,"r")
+    lines = fin.readlines()
+    fin.close()
+    fout = open(os.path.join(self.w.build_dir,"src","sketch.ino"),"w")
+    for l in lines:
+      if re.match(r"^byte server\[\] = {",l):
+        fout.write("byte server[] = { %s };\n"%(settings.server_ip.replace(".",", "),))
+      elif re.match(r"^byte ip\[\] = {",l):
+        fout.write("byte ip[] = { %s };\n"%(settings.arduino_ip.replace(".",", "),))
+      else:
+        fout.write(l)
+    fout.flush()
+    fout.close()
+    
+    # Run build
+    fout = open(self.build_log, "w")
+    ferr = open(self.build_err_log, "w")
+    rc = call(["ino","build"],stdout=fout,stderr=ferr)
+    fout.close()
+    ferr.close()
+    if rc == 0:
+      sys.stdout.write("pass")
+      sys.stdout.write("\n")
+      return True
+    else:
+      sys.stdout.write("fail")
+      sys.stdout.write("\n")
+      with open(self.build_err_log) as f:
+        for line in f:
+          print " ",line,
+      return False
+  
+  def upload(self):
+    sys.stdout.write(" Upload:  ")
+    sys.stdout.flush()
+    fout = open(self.build_upload_log, "w")
+    rc = call(["ino","upload"],stdout=fout,stderr=fout)
+    fout.close()
+    if rc == 0:
+      sys.stdout.write("pass")
+      sys.stdout.write("\n")
+      return True
+    else:
+      sys.stdout.write("fail")
+      sys.stdout.write("\n")
+      with open(self.build_upload_log) as f:
+        for line in f:
+          print " ",line,
+      return False
+
+
+  def test(self):
+    # import the matching test case, if it exists
+    try:
+      basename = os.path.basename(self.filename)[:-4]
+      i = importlib.import_module("testcases."+basename)
+    except:
+      sys.stdout.write(" Test:    no tests found")
+      sys.stdout.write("\n")
+      return
+    c = getattr(i,basename)
+    
+    testmethods = [m for m in dir(c) if m.startswith("test_")]
+    testmethods.sort()
+    tests = []
+    for m in testmethods:
+      tests.append(c(m))
+      
+    result = unittest.TestResult()
+    c.setUpClass()
+    if self.upload():
+      sys.stdout.write(" Test:    ")
+      sys.stdout.flush()
+      for t in tests:
+        t.run(result)
+        print "%d/%d"%(result.testsRun-len(result.failures)-len(result.errors),result.testsRun)
+        if not result.wasSuccessful():
+          if len(result.failures) > 0:
+            for f in result.failures:
+              print "-- %s"%(str(f[0]),)
+              print f[1]
+          if len(result.errors) > 0:
+            print " Errors:"
+            for f in result.errors:
+              print "-- %s"%(str(f[0]),)
+              print f[1]
+    c.tearDownClass()
+
+if __name__ == '__main__':
+  run_tests = True
+
+  w = Workspace()
+  w.init()
+  
+  for e in w.examples:
+    print "--------------------------------------"
+    print "[%s]"%(e.basename,)
+    if e.build() and run_tests:
+      e.test()
+  for e in w.tests:
+    print "--------------------------------------"
+    print "[%s]"%(e.basename,)
+    if e.build() and run_tests:
+      e.test()
+  
+  w.clean()
