diff --git a/cores/esp8266/spiffs/spiffs_esp8266.c b/cores/esp8266/spiffs/spiffs_esp8266.c
index e0a79d505..7cd4fd684 100644
--- a/cores/esp8266/spiffs/spiffs_esp8266.c
+++ b/cores/esp8266/spiffs/spiffs_esp8266.c
@@ -1,3 +1,10 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/anakod/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ ****/
+
 #include "spiffs_esp8266.h"
 #include "spi_flash.h"
 #include "esp8266_peri.h"
@@ -152,6 +159,6 @@ uint32_t flashmem_read( void *to, uint32_t fromaddr, uint32_t size ){
 
 //shorthand when start and end addresses of the sector are not needed
 uint32_t flashmem_get_sector_of_address( uint32_t addr ){
-  return (addr - INTERNAL_FLASH_START_ADDRESS) / INTERNAL_FLASH_SECTOR_SIZE;;
+  return (addr - INTERNAL_FLASH_START_ADDRESS) / INTERNAL_FLASH_SECTOR_SIZE;
 }
 
diff --git a/cores/esp8266/spiffs/spiffs_esp8266.h b/cores/esp8266/spiffs/spiffs_esp8266.h
index d97f3e3e0..cd1eb3544 100644
--- a/cores/esp8266/spiffs/spiffs_esp8266.h
+++ b/cores/esp8266/spiffs/spiffs_esp8266.h
@@ -1,3 +1,10 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/anakod/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ ****/
+
 #ifndef SYSTEM_FLASHMEM_H_
 #define SYSTEM_FLASHMEM_H_
 
@@ -17,7 +24,6 @@ The small 4KB sectors allow for greater flexibility in applications that require
 #define SPIFFS_API_DBG_V(fmt, ...) //os_printf(fmt, ##__VA_ARGS__)
 #define SPIFFS_API_DBG_E(fmt, ...) //os_printf("ERROR: " fmt , ##__VA_ARGS__)
 
-#define INTERNAL_FLASH_PAGE_SIZE        256
 #define INTERNAL_FLASH_SECTOR_SIZE      4096
 #define INTERNAL_FLASH_START_ADDRESS    0x40200000
 
@@ -27,7 +33,6 @@ The small 4KB sectors allow for greater flexibility in applications that require
 extern uint32_t flashmem_write( const void *from, uint32_t toaddr, uint32_t size );
 extern uint32_t flashmem_read( void *to, uint32_t fromaddr, uint32_t size );
 extern bool flashmem_erase_sector( uint32_t sector_id );
-uint32_t flashmem_find_sector( uint32_t address, uint32_t *pstart, uint32_t *pend );
 uint32_t flashmem_get_sector_of_address( uint32_t addr );
 
 #ifdef __cplusplus
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/FSWebServer.ino b/libraries/ESP8266WebServer/examples/FSWebServer/FSWebServer.ino
new file mode 100644
index 000000000..fccf2b3eb
--- /dev/null
+++ b/libraries/ESP8266WebServer/examples/FSWebServer/FSWebServer.ino
@@ -0,0 +1,258 @@
+/* 
+  FSWebServer - Example WebServer with SPIFFS backend for esp8266
+
+  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
+
+  upload the contents of the data folder with MkSPIFFS Tool ("ESP8266 Sketch Data Upload" in Tools menu in Arduino IDE)
+  !!! This will erase any previous SPIFFS data you may have!
+  !!! Make Backups First !!!
+  if you do not have it, get it at : <<<FILL THIS
+  access the sample web page at http://esp8266fs.local
+  edit the page by going to http://esp8266fs.local/edit
+
+*/
+#include <ESP8266WiFi.h>
+#include <WiFiClient.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+#include <FileSystem.h>
+
+#define DBG_OUTPUT_PORT Serial
+
+const char* ssid = "**********";
+const char* password = "**********";
+const char* hostname = "esp8266fs";
+
+MDNSResponder mdns;
+ESP8266WebServer server(80);
+//holds the current upload
+FSFile fsUploadFile;
+
+//format bytes
+char *formatBytes(size_t bytes){
+  if (bytes < 1024){
+    return (char *)String(String(bytes)+"B").c_str();
+  } else if(bytes < (1024 * 1024)){
+    return (char *)String(String(bytes/1024.0)+"KB").c_str();
+  } else if(bytes < (1024 * 1024 * 1024)){
+    return (char *)String(String(bytes/1024.0/1024.0)+"MB").c_str();
+  } else {
+    return (char *)String(String(bytes/1024.0/1024.0/1024.0)+"GB").c_str();
+  }
+}
+
+String getContentType(String filename){
+  if(server.hasArg("download")) return "application/octet-stream";
+  else if(filename.endsWith(".htm")) return "text/html";
+  else if(filename.endsWith(".css")) return "text/css";
+  else if(filename.endsWith(".js")) return "application/javascript";
+  else if(filename.endsWith(".png")) return "image/png";
+  else if(filename.endsWith(".gif")) return "image/gif";
+  else if(filename.endsWith(".jpg")) return "image/jpeg";
+  else if(filename.endsWith(".ico")) return "image/x-icon";
+  else if(filename.endsWith(".xml")) return "text/xml";
+  else if(filename.endsWith(".pdf")) return "application/x-pdf";
+  else if(filename.endsWith(".zip")) return "application/x-zip";
+  else if(filename.endsWith(".gz")) return "application/x-gzip";
+  return "text/plain";
+}
+
+bool handleFileRead(String path){
+  if(path.endsWith("/")) path += "index.htm";
+  String contentType = getContentType(path);
+  if(FS.exists((char *)(path+".gz").c_str()) || FS.exists((char *)path.c_str())){
+    if(FS.exists((char *)(path+".gz").c_str()))
+      path += ".gz";
+    FSFile file = FS.open((char *)path.c_str());
+    server.streamFile(file, contentType);
+    file.close();
+    return true;
+  }
+  return false;
+}
+
+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 = FS.open((char *)filename.c_str(), FSFILE_OVERWRITE);
+    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);
+  } else if(upload.status == UPLOAD_FILE_END){
+    if(fsUploadFile)
+      fsUploadFile.close();
+    DBG_OUTPUT_PORT.print("Upload Size: "); DBG_OUTPUT_PORT.println(upload.totalSize);
+  }
+}
+
+void handleFileDelete(){
+  if(server.args() == 0) return server.send(500, "text/plain", "BAD ARGS");
+  String path = server.arg(0);
+  if(path == "/")
+    return server.send(500, "text/plain", "BAD PATH");
+  if(!FS.exists((char *)(path.c_str())))
+    return server.send(404, "text/plain", "FileNotFound");
+  FS.remove((char *)path.c_str());
+  server.send(200, "text/plain", "");
+  path = String();
+}
+
+void handleFileCreate(){
+  if(server.args() == 0)
+    return server.send(500, "text/plain", "BAD ARGS");
+  String path = server.arg(0);
+  if(path == "/")
+    return server.send(500, "text/plain", "BAD PATH");
+  if(FS.exists((char *)path.c_str()))
+    return server.send(500, "text/plain", "FILE EXISTS");
+  FSFile file = FS.open((char *)path.c_str(), FSFILE_OVERWRITE);
+  if(file)
+    file.close();
+  else
+    return server.send(500, "text/plain", "CREATE FAILED");
+  server.send(200, "text/plain", "");
+  path = String();
+}
+
+void handleFileList() {
+  if(!server.hasArg("dir")) return server.send(500, "text/plain", "BAD ARGS");
+  String path = server.arg("dir");
+  
+  FSFile entry;
+  FSFile dir = FS.open((char *)path.c_str());
+  path = String();
+  if(!dir.isDirectory()){
+    dir.close();
+    server.send(500, "text/plain", "NOT DIR");
+    return;
+  }
+  dir.rewindDirectory();
+
+  WiFiClient client = server.client();
+  client.print("HTTP/1.1 200 OK\r\nContent-Type: text/json\r\nConnection: close\r\n\r\n");
+  String output = "[";
+  while(true){
+    entry = dir.openNextFile();
+    if (!entry) break;
+    if(!FS.exists(entry.name())){
+      os_printf("Entry[%s] Not Exists!\n", entry.name());
+      entry.remove();
+      entry.close();
+      continue;
+    }
+    if(output != "[") output += ',';
+    output += "{\"type\":\"";
+    output += (entry.isDirectory())?"dir":"file";
+    output += "\",\"name\":\"";
+    output += String(entry.name()).substring(1);
+    output += "\"}";
+    entry.close();
+  }
+  dir.close();
+    
+  output += "]";
+  client.write(output.c_str(), output.length());
+  output = String();
+  uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;
+  while(client.connected() && maxWait--) {
+    delay(1);
+  }
+}
+
+void setup(void){
+  DBG_OUTPUT_PORT.begin(115200);
+  DBG_OUTPUT_PORT.print("\n");
+  
+  //SPIFFS INIT
+  DBG_OUTPUT_PORT.printf("\n==== SPIFFS Info ====\n");
+  DBG_OUTPUT_PORT.printf("FS Mount: %d\n", FS.mount());
+  DBG_OUTPUT_PORT.printf("FS Size: %s\n", formatBytes(FS.size()));
+  DBG_OUTPUT_PORT.printf("FS Bytes: total: %s, used: %s\n", formatBytes(FS.totalBytes()), formatBytes(FS.usedBytes()));
+  DBG_OUTPUT_PORT.printf("FS Blocks: total: %d, free: %d, size: %s\n", FS.totalBlocks(), FS.freeBlocks(), formatBytes(FS.blockSize()));
+  DBG_OUTPUT_PORT.printf("FS Pages: allocated: %d, deleted: %d, size: %s\n", FS.allocatedPages(), FS.deletedPages(), formatBytes(FS.pageSize()));
+  FSFile entry;
+  FSFile dir = FS.open((char *)"/");
+  while(true){
+    entry = dir.openNextFile();
+    if (!entry) break;
+    DBG_OUTPUT_PORT.printf("FS File: %s, type: %s, size: %s\n", entry.name(), (entry.isDirectory())?"dir":"file", formatBytes(entry.size()));
+    entry.close();
+  }
+  dir.close();
+  DBG_OUTPUT_PORT.printf("\n");
+
+  //WIFI INIT
+  DBG_OUTPUT_PORT.printf("Connecting to %s\n", ssid);
+  WiFi.begin(ssid, password);
+  if(WiFi.waitForConnectResult() != WL_CONNECTED){
+    DBG_OUTPUT_PORT.printf("Could not connect to %s\n", ssid);
+    while(1) delay(500);
+  }
+  DBG_OUTPUT_PORT.print("Connected! IP address: ");
+  DBG_OUTPUT_PORT.println(WiFi.localIP());
+  
+  //mDNS INIT
+  if (mdns.begin(hostname, WiFi.localIP()))
+    DBG_OUTPUT_PORT.printf("mDNS responder started for %s.local\n", hostname);
+
+  //SERVER INIT
+  //list directory
+  server.on("/list", HTTP_GET, handleFileList);
+  //load editor
+  server.on("/edit", HTTP_GET, [](){
+    if(!handleFileRead("/edit.htm")) server.send(404, "text/plain", "FileNotFound");
+  });
+  //create file
+  server.on("/edit", HTTP_PUT, handleFileCreate);
+  //delete file
+  server.on("/edit", HTTP_DELETE, handleFileDelete);
+  //called after file upload
+  server.on("/edit", HTTP_POST, [](){ server.send(200, "text/plain", ""); });
+  //called when a file is received inside POST data
+  server.onFileUpload(handleFileUpdate);
+
+  //called when the url is not defined here
+  //use it to load content from SPIFFS
+  server.onNotFound([](){
+    if(!handleFileRead(server.uri()))
+      server.send(404, "text/plain", "FileNotFound");
+  });
+
+  //get heap status, analog input value and all GPIO statuses in one json call
+  server.on("/all", HTTP_GET, [](){
+    String json = "{";
+    json += "\"heap\":"+String(ESP.getFreeHeap());
+    json += ", \"analog\":"+String(analogRead(A0));
+    json += ", \"gpio\":"+String((uint32_t)(((GPI | GPO) & 0xFFFF) | ((GP16I & 0x01) << 16)));
+    json += "}";
+    server.send(200, "text/json", json);
+    json = String();
+  });
+  server.begin();
+  DBG_OUTPUT_PORT.println("HTTP server started");
+
+}
+ 
+void loop(void){
+  server.handleClient();
+}
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/edit.htm.gz b/libraries/ESP8266WebServer/examples/FSWebServer/data/edit.htm.gz
new file mode 100644
index 000000000..9ee1b81f0
Binary files /dev/null and b/libraries/ESP8266WebServer/examples/FSWebServer/data/edit.htm.gz differ
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/favicon.ico b/libraries/ESP8266WebServer/examples/FSWebServer/data/favicon.ico
new file mode 100644
index 000000000..71b25fe6e
Binary files /dev/null and b/libraries/ESP8266WebServer/examples/FSWebServer/data/favicon.ico differ
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/graphs.js.gz b/libraries/ESP8266WebServer/examples/FSWebServer/data/graphs.js.gz
new file mode 100644
index 000000000..72435445a
Binary files /dev/null and b/libraries/ESP8266WebServer/examples/FSWebServer/data/graphs.js.gz differ
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/index.htm b/libraries/ESP8266WebServer/examples/FSWebServer/data/index.htm
new file mode 100644
index 000000000..facca7b97
--- /dev/null
+++ b/libraries/ESP8266WebServer/examples/FSWebServer/data/index.htm
@@ -0,0 +1,100 @@
+<!-- 
+  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>ESP Monitor</title>
+  <script type="text/javascript" src="graphs.js"></script>
+  <script type="text/javascript">
+    var heap,temp,digi;
+    var reloadPeriod = 1000;
+    var running = false;
+    
+    function loadValues(){
+      if(!running) return;
+      var xh = new XMLHttpRequest();
+      xh.onreadystatechange = function(){
+        if (xh.readyState == 4){
+          if(xh.status == 200) {
+            var res = JSON.parse(xh.responseText);
+            heap.add(res.heap);
+            temp.add(res.analog);
+            digi.add(res.gpio);
+            if(running) setTimeout(loadValues, reloadPeriod);
+          } else running = false;
+        }
+      };
+      xh.open("GET", "/all", true);
+      xh.send(null);
+    };
+    
+    function run(){
+      if(!running){
+        running = true;
+        loadValues();
+      }
+    }
+    
+    function onBodyLoad(){
+      var refreshInput = document.getElementById("refresh-rate");
+      refreshInput.value = reloadPeriod;
+      refreshInput.onchange = function(e){
+        var value = parseInt(e.target.value);
+        reloadPeriod = (value > 0)?value:0;
+        e.target.value = reloadPeriod;
+      }
+      var stopButton = document.getElementById("stop-button");
+      stopButton.onclick = function(e){
+        running = false;
+      }
+      var startButton = document.getElementById("start-button");
+      startButton.onclick = function(e){
+        run();
+      }
+      
+      // Example with 10K thermistor
+      //function calcThermistor(v) {
+      //  var t = Math.log(((10230000 / v) - 10000));
+      //  t = (1/(0.001129148+(0.000234125*t)+(0.0000000876741*t*t*t)))-273.15;
+      //  return (t>120)?0:Math.round(t*10)/10;
+      //}
+      //temp = createGraph(document.getElementById("analog"), "Temperature", 100, 128, 10, 40, false, "cyan", calcThermistor);
+      
+      temp = createGraph(document.getElementById("analog"), "Analog Input", 100, 128, 0, 1023, false, "cyan");
+      heap = createGraph(document.getElementById("heap"), "Current Heap", 100, 125, 0, 30000, true, "orange");
+      digi = createDigiGraph(document.getElementById("digital"), "GPIO", 100, 146, [0, 4, 5, 16], "gold");
+      run();
+    }
+  </script>
+</head>
+<body id="index" style="margin:0; padding:0;" onload="onBodyLoad()">
+  <div id="controls" style="display: block; border: 1px solid rgb(68, 68, 68); padding: 5px; margin: 5px; width: 362px; background-color: rgb(238, 238, 238);">
+    <label>Period (ms):</label>
+    <input type="number" id="refresh-rate"/>
+    <input type="button" id="start-button" value="Start"/>
+    <input type="button" id="stop-button" value="Stop"/>
+  </div>
+  <div id="heap"></div>
+  <div id="analog"></div>
+  <div id="digital"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/src/edit-src.htm b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/edit-src.htm
new file mode 100644
index 000000000..980acc168
--- /dev/null
+++ b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/edit-src.htm
@@ -0,0 +1,512 @@
+<!-- 
+  FSWebServer - SPIFFS Editor/Manager
+
+  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 lang="en">
+<head>
+<title>ESP Editor</title>
+<style type="text/css" media="screen">
+.cm {
+  z-index: 300;
+  position: absolute;
+  left: 5px;
+  border: 1px solid #444;
+  background-color: #F5F5F5;
+  display: none;
+  box-shadow: 0 0 10px rgba( 0, 0, 0, .4 );
+  font-size: 12px;
+  font-family: sans-serif;
+  font-weight:bold;
+}
+.cm ul {
+  list-style: none;
+  top: 0;
+  left: 0;
+  margin: 0;
+  padding: 0;
+}
+.cm li {
+  position: relative;
+  min-width: 60px;
+  cursor: pointer;
+}
+.cm span {
+  color: #444;
+  display: inline-block;
+  padding: 6px;
+}
+.cm li:hover { background: #444; }
+.cm li:hover span { color: #EEE; }
+.tvu ul, .tvu li {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+.tvu input {
+  position: absolute;
+  opacity: 0;
+}
+.tvu {
+  font: normal 12px Verdana, Arial, Sans-serif;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  color: #444;
+  line-height: 16px;
+}
+.tvu span {
+  margin-bottom:5px;
+  padding: 0 0 0 18px;
+  cursor: pointer;
+  display: inline-block;
+  height: 16px;
+  vertical-align: middle;
+  background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADoSURBVBgZBcExblNBGAbA2ceegTRBuIKOgiihSZNTcC5LUHAihNJR0kGKCDcYJY6D3/77MdOinTvzAgCw8ysThIvn/VojIyMjIyPP+bS1sUQIV2s95pBDDvmbP/mdkft83tpYguZq5Jh/OeaYh+yzy8hTHvNlaxNNczm+la9OTlar1UdA/+C2A4trRCnD3jS8BB1obq2Gk6GU6QbQAS4BUaYSQAf4bhhKKTFdAzrAOwAxEUAH+KEM01SY3gM6wBsEAQB0gJ+maZoC3gI6iPYaAIBJsiRmHU0AALOeFC3aK2cWAACUXe7+AwO0lc9eTHYTAAAAAElFTkSuQmCC') no-repeat;
+  background-position: 0px 0px;
+}
+.tvu span:hover {
+  text-decoration: underline;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0){
+  .tvu{
+    -webkit-animation: webkit-adjacent-element-selector-bugfix infinite 1s;
+  }
+
+  @-webkit-keyframes webkit-adjacent-element-selector-bugfix {
+    from { 
+      padding: 0;
+    } 
+    to { 
+      padding: 0;
+    }
+  }
+}
+#uploader { 
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  height:28px;
+  line-height: 24px;
+  padding-left: 10px;
+  background-color: #444;
+  color:#EEE;
+}
+#tree { 
+  position: absolute;
+  top: 28px;
+  bottom: 0;
+  left: 0;
+  width:160px;
+  padding: 8px;
+}
+#editor, #preview { 
+  position: absolute;
+  top: 28px;
+  right: 0;
+  bottom: 0;
+  left: 160px;
+  border-left:1px solid #EEE;
+}
+#preview {
+  background-color: #EEE;
+  padding:5px;
+}
+</style>
+<script>
+function createFileUploader(element, tree, editor){
+  var xmlHttp;
+  var input = document.createElement("input");
+  input.type = "file";
+  input.multiple = false;
+  input.name = "data";
+  document.getElementById(element).appendChild(input);
+  var path = document.createElement("input");
+  path.id = "upload-path";
+  path.type = "text";
+  path.name = "path";
+  path.defaultValue = "/";
+  document.getElementById(element).appendChild(path);
+  var button = document.createElement("button");
+  button.innerHTML = 'Upload';
+  document.getElementById(element).appendChild(button);
+  var mkfile = document.createElement("button");
+  mkfile.innerHTML = 'MkDir';
+  document.getElementById(element).appendChild(mkfile);
+
+  function httpPostProcessRequest(){
+    if (xmlHttp.readyState == 4){
+      if(xmlHttp.status != 200) alert("ERROR["+xmlHttp.status+"]: "+xmlHttp.responseText);
+      else {
+        tree.refreshPath(path.value);
+      }
+    }
+  }
+  function createPath(p){
+    xmlHttp = new XMLHttpRequest();
+    xmlHttp.onreadystatechange = httpPostProcessRequest;
+    var formData = new FormData();
+    formData.append("path", p);
+    xmlHttp.open("PUT", "/edit");
+    xmlHttp.send(formData);
+  }
+  
+  mkfile.onclick = function(e){
+    if(path.value.indexOf(".") === -1) return;
+    createPath(path.value);
+    editor.loadUrl(path.value);
+  };
+  button.onclick = function(e){
+    if(input.files.length === 0){
+      return;
+    }
+    xmlHttp = new XMLHttpRequest();
+    xmlHttp.onreadystatechange = httpPostProcessRequest;
+    var formData = new FormData();
+    formData.append("data", input.files[0], path.value);
+    xmlHttp.open("POST", "/edit");
+    xmlHttp.send(formData);
+  };
+  input.onchange = function(e){
+    if(input.files.length === 0) return;
+    var filename = input.files[0].name;
+    var ext = /(?:\.([^.]+))?$/.exec(filename)[1];
+    var name = /(.*)\.[^.]+$/.exec(filename)[1];
+    if(typeof name !== undefined){
+      filename = name;
+    }
+    if(typeof ext !== undefined){
+      if(ext === "html") ext = "htm";
+      else if(ext === "jpeg") ext = "jpg";
+      filename = filename + "." + ext;
+    }
+    if(path.value === "/" || path.value.lastIndexOf("/") === 0){
+      path.value = "/"+filename;
+    } else {
+      path.value = path.value.substring(0, path.value.lastIndexOf("/")+1)+filename;
+    }
+  };
+}
+
+function createTree(element, editor){
+  var preview = document.getElementById("preview");
+  var treeRoot = document.createElement("div");
+  treeRoot.className = "tvu";
+  document.getElementById(element).appendChild(treeRoot);
+
+  function loadDownload(path){
+    document.getElementById('download-frame').src = path+"?download=true";
+  }
+
+  function loadPreview(path){
+    document.getElementById("editor").style.display = "none";
+    preview.style.display = "block";
+    preview.innerHTML = '<img src="'+path+'?_cb='+Date.now()+'" style="max-width:100%; max-height:100%; margin:auto; display:block;" />';
+  }
+
+  function fillFileMenu(el, path){
+    var list = document.createElement("ul");
+    el.appendChild(list);
+    var action = document.createElement("li");
+    list.appendChild(action);
+    if(isTextFile(path)){
+      action.innerHTML = "<span>Edit</span>";
+      action.onclick = function(e){
+        editor.loadUrl(path);
+        if(document.body.getElementsByClassName('cm').length > 0) document.body.removeChild(el);
+      };
+    } else if(isImageFile(path)){
+      action.innerHTML = "<span>Preview</span>";
+      action.onclick = function(e){
+        loadPreview(path);
+        if(document.body.getElementsByClassName('cm').length > 0) document.body.removeChild(el);
+      };
+    }
+    var download = document.createElement("li");
+    list.appendChild(download);
+    download.innerHTML = "<span>Download</span>";
+    download.onclick = function(e){
+      loadDownload(path);
+      if(document.body.getElementsByClassName('cm').length > 0) document.body.removeChild(el);
+    };
+    var delFile = document.createElement("li");
+    list.appendChild(delFile);
+    delFile.innerHTML = "<span>Delete</span>";
+    delFile.onclick = function(e){
+      httpDelete(path);
+      if(document.body.getElementsByClassName('cm').length > 0) document.body.removeChild(el);
+    };
+  }
+
+  function showContextMenu(e, path, isfile){
+    var divContext = document.createElement("div");
+    var scrollTop = document.body.scrollTop ? document.body.scrollTop : document.documentElement.scrollTop;
+    var scrollLeft = document.body.scrollLeft ? document.body.scrollLeft : document.documentElement.scrollLeft;
+    var left = event.clientX + scrollLeft;
+    var top = event.clientY + scrollTop;
+    divContext.className = 'cm';
+    divContext.style.display = 'block';
+    divContext.style.left = left + 'px';
+    divContext.style.top = top + 'px';
+    fillFileMenu(divContext, path);
+    document.body.appendChild(divContext);
+    var width = divContext.offsetWidth;
+    var height = divContext.offsetHeight;
+    divContext.onmouseout = function(e){
+      if(e.clientX < left || e.clientX > (left + width) || e.clientY < top || e.clientY > (top + height)){
+        if(document.body.getElementsByClassName('cm').length > 0) document.body.removeChild(divContext);
+      }
+    };
+  }
+
+  function createTreeLeaf(path, name, size){
+    var leaf = document.createElement("li");
+    leaf.id = (((path == "/")?"":path)+"/"+name);
+    var label = document.createElement("span");
+    label.innerText = name;
+    leaf.appendChild(label);
+    leaf.onclick = function(e){
+      if(isTextFile(leaf.id.toLowerCase())){
+        editor.loadUrl(leaf.id);
+      } else if(isImageFile(leaf.id.toLowerCase())){
+        loadPreview(leaf.id);
+      }
+    };
+    leaf.oncontextmenu = function(e){
+      e.preventDefault();
+      e.stopPropagation();
+      showContextMenu(e, leaf.id, true);
+    };
+    return leaf;
+  }
+
+  function addList(parent, path, items){
+    var list = document.createElement("ul");
+    parent.appendChild(list);
+    var ll = items.length;
+    for(var i = 0; i < ll; i++){
+      if(items[i].type === "file")
+        list.appendChild(createTreeLeaf(path, items[i].name, items[i].size));
+    }
+
+  }
+
+  function isTextFile(path){
+    var ext = /(?:\.([^.]+))?$/.exec(path)[1];
+    if(typeof ext !== undefined){
+      switch(ext){
+        case "txt":
+        case "htm":
+        case "js":
+        case "c":
+        case "cpp":
+        case "css":
+        case "xml":
+          return true;
+      }
+    }
+    return false;
+  }
+
+  function isImageFile(path){
+    var ext = /(?:\.([^.]+))?$/.exec(path)[1];
+    if(typeof ext !== undefined){
+      switch(ext){
+        case "png":
+        case "jpg":
+        case "gif":
+          return true;
+      }
+    }
+    return false;
+  }
+
+  this.refreshPath = function(path){
+    treeRoot.removeChild(treeRoot.childNodes[0]);
+    httpGet(treeRoot, "/");
+  };
+
+  function delCb(path){
+    return function(){
+      if (xmlHttp.readyState == 4){
+        if(xmlHttp.status != 200){
+          alert("ERROR["+xmlHttp.status+"]: "+xmlHttp.responseText);
+        } else {
+          treeRoot.removeChild(treeRoot.childNodes[0]);
+          httpGet(treeRoot, "/");
+        }
+      }
+    }
+  }
+
+  function httpDelete(filename){
+    xmlHttp = new XMLHttpRequest();
+    xmlHttp.onreadystatechange = delCb(filename);
+    var formData = new FormData();
+    formData.append("path", filename);
+    xmlHttp.open("DELETE", "/edit");
+    xmlHttp.send(formData);
+  }
+
+  function getCb(parent, path){
+    return function(){
+      if (xmlHttp.readyState == 4){
+        if(xmlHttp.status == 200) addList(parent, path, JSON.parse(xmlHttp.responseText));
+      }
+    }
+  }
+
+  function httpGet(parent, path){
+    xmlHttp = new XMLHttpRequest(parent, path);
+    xmlHttp.onreadystatechange = getCb(parent, path);
+    xmlHttp.open("GET", "/list?dir="+path, true);
+    xmlHttp.send(null);
+  }
+
+  httpGet(treeRoot, "/");
+  return this;
+}
+
+function createEditor(element, file, lang, theme, type){
+  function getLangFromFilename(filename){
+    var lang = "plain";
+    var ext = /(?:\.([^.]+))?$/.exec(filename)[1];
+    if(typeof ext !== undefined){
+      switch(ext){
+        case "txt": lang = "plain"; break;
+        case "htm": lang = "html"; break;
+        case "js": lang = "javascript"; break;
+        case "c": lang = "c_cpp"; break;
+        case "cpp": lang = "c_cpp"; break;
+        case "css":
+        case "scss":
+        case "php":
+        case "html":
+        case "json":
+        case "xml":
+          lang = ext;
+      }
+    }
+    return lang;
+  }
+
+  if(typeof file === "undefined") file = "/index.htm";
+
+  if(typeof lang === "undefined"){
+    lang = getLangFromFilename(file);
+  }
+
+  if(typeof theme === "undefined") theme = "textmate";
+
+  if(typeof type === "undefined"){
+    type = "text/"+lang;
+    if(lang === "c_cpp") type = "text/plain";
+  }
+
+  var xmlHttp = null;
+  var editor = ace.edit(element);
+  function httpPostProcessRequest(){
+    if (xmlHttp.readyState == 4){
+      if(xmlHttp.status != 200) alert("ERROR["+xmlHttp.status+"]: "+xmlHttp.responseText);
+    }
+  }
+  function httpPost(filename, data, type){
+    xmlHttp = new XMLHttpRequest();
+    xmlHttp.onreadystatechange = httpPostProcessRequest;
+    var formData = new FormData();
+    formData.append("data", new Blob([data], { type: type }), filename);
+    xmlHttp.open("POST", "/edit");
+    xmlHttp.send(formData);
+  }
+  function httpGetProcessRequest(){
+    if (xmlHttp.readyState == 4){
+      document.getElementById("preview").style.display = "none";
+      document.getElementById("editor").style.display = "block";
+      if(xmlHttp.status == 200) editor.setValue(xmlHttp.responseText);
+      else editor.setValue("");
+      editor.clearSelection();
+    }
+  }
+  function httpGet(theUrl){
+      xmlHttp = new XMLHttpRequest();
+      xmlHttp.onreadystatechange = httpGetProcessRequest;
+      xmlHttp.open("GET", theUrl, true);
+      xmlHttp.send(null);
+  }
+
+  if(lang !== "plain") editor.getSession().setMode("ace/mode/"+lang);
+  editor.setTheme("ace/theme/"+theme);
+  editor.$blockScrolling = Infinity;
+  editor.getSession().setUseSoftTabs(true);
+  editor.getSession().setTabSize(2);
+  editor.setHighlightActiveLine(true);
+  editor.setShowPrintMargin(false);
+  editor.commands.addCommand({
+      name: 'saveCommand',
+      bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
+      exec: function(editor) {
+        httpPost(file, editor.getValue()+"", type);
+      },
+      readOnly: false
+  });
+  editor.commands.addCommand({
+      name: 'undoCommand',
+      bindKey: {win: 'Ctrl-Z',  mac: 'Command-Z'},
+      exec: function(editor) {
+        editor.getSession().getUndoManager().undo(false);
+      },
+      readOnly: false
+  });
+  editor.commands.addCommand({
+      name: 'redoCommand',
+      bindKey: {win: 'Ctrl-Shift-Z',  mac: 'Command-Shift-Z'},
+      exec: function(editor) {
+        editor.getSession().getUndoManager().redo(false);
+      },
+      readOnly: false
+  });
+  httpGet(file);
+  editor.loadUrl = function(filename){
+    file = filename;
+    lang = getLangFromFilename(file);
+    type = "text/"+lang;
+    if(lang !== "plain") editor.getSession().setMode("ace/mode/"+lang);
+    httpGet(file);
+  };
+  return editor;
+}
+function onBodyLoad(){
+  var vars = {};
+  var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { vars[key] = value; });
+  var editor = createEditor("editor", vars.file, vars.lang, vars.theme);
+  var tree = createTree("tree", editor);
+  createFileUploader("uploader", tree, editor);
+};
+</script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.9/ace.js" type="text/javascript" charset="utf-8"></script>
+</head>
+<body onload="onBodyLoad();">
+  <div id="uploader"></div>
+  <div id="tree"></div>
+  <div id="editor"></div>
+  <div id="preview" style="display:none;"></div>
+  <iframe id=download-frame style='display:none;'></iframe>
+</body>
+</html>
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/src/edit.htm b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/edit.htm
new file mode 100644
index 000000000..cfd70baf7
--- /dev/null
+++ b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/edit.htm
@@ -0,0 +1,3 @@
+<!DOCTYPE html><html lang="en"><head><title>ESP Editor</title><style type="text/css" media="screen">.cm{z-index:300;position:absolute;left:5px;border:1px solid #444;background-color:#F5F5F5;display:none;box-shadow:0 0 10px rgba(0,0,0,.4);font-size:12px;font-family:sans-serif;font-weight:700}.cm ul{list-style:none;top:0;left:0;margin:0;padding:0}.cm li{position:relative;min-width:60px;cursor:pointer}.cm span{color:#444;display:inline-block;padding:6px}.cm li:hover{background:#444}.cm li:hover span{color:#EEE}.tvu ul,.tvu li{padding:0;margin:0;list-style:none}.tvu input{position:absolute;opacity:0}.tvu{font:normal 12px Verdana,Arial,Sans-serif;-moz-user-select:none;-webkit-user-select:none;user-select:none;color:#444;line-height:16px}.tvu span{margin-bottom:5px;padding:0 0 0 18px;cursor:pointer;display:inline-block;height:16px;vertical-align:middle;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAADoSURBVBgZBcExblNBGAbA2ceegTRBuIKOgiihSZNTcC5LUHAihNJR0kGKCDcYJY6D3/77MdOinTvzAgCw8ysThIvn/VojIyMjIyPP+bS1sUQIV2s95pBDDvmbP/mdkft83tpYguZq5Jh/OeaYh+yzy8hTHvNlaxNNczm+la9OTlar1UdA/+C2A4trRCnD3jS8BB1obq2Gk6GU6QbQAS4BUaYSQAf4bhhKKTFdAzrAOwAxEUAH+KEM01SY3gM6wBsEAQB0gJ+maZoC3gI6iPYaAIBJsiRmHU0AALOeFC3aK2cWAACUXe7+AwO0lc9eTHYTAAAAAElFTkSuQmCC) no-repeat;background-position:0 0}.tvu span:hover{text-decoration:underline}@media screen and (-webkit-min-device-pixel-ratio:0){.tvu{-webkit-animation:webkit-adjacent-element-selector-bugfix infinite 1s}}@-webkit-keyframes webkit-adjacent-element-selector-bugfix{from{padding:0}to{padding:0}}#uploader{position:absolute;top:0;right:0;left:0;height:28px;line-height:24px;padding-left:10px;background-color:#444;color:#EEE}#tree{position:absolute;top:28px;bottom:0;left:0;width:160px;padding:8px}#editor,#preview{position:absolute;top:28px;right:0;bottom:0;left:160px;border-left:1px solid #EEE}#preview{background-color:#EEE;padding:5px}</style><script>
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('3 2d(d,f,g){5 h;5 i=6.r("2e");i.1a="1e";i.2o=w;i.G="1C";6.v(d).s(i);5 j=6.r("2e");j.K="3h-17";j.1a="13";j.G="17";j.2G="/";6.v(d).s(j);5 k=6.r("2i");k.J=\'2t\';6.v(d).s(k);5 l=6.r("2i");l.J=\'37\';6.v(d).s(l);3 10(){7(h.Y==4){7(h.B!=W)1t("1s["+h.B+"]: "+h.U);L{f.1E(j.t)}}}3 1H(p){h=u T();h.R=10;5 a=u 1c();a.1d("17",p);h.P("2s","/X");h.Q(a)}l.H=3(e){7(j.t.3n(".")===-1)q;1H(j.t);g.15(j.t)};k.H=3(e){7(i.16.C===0){q}h=u T();h.R=10;5 a=u 1c();a.1d("1C",i.16[0],j.t);h.P("1M","/X");h.Q(a)};i.3j=3(e){7(i.16.C===0)q;5 a=i.16[0].G;5 b=/(?:\\.([^.]+))?$/.E(a)[1];5 c=/(.*)\\.[^.]+$/.E(a)[1];7(z c!==y){a=c}7(z b!==y){7(b==="1p")b="1b";L 7(b==="3c")b="1N";a=a+"."+b}7(j.t==="/"||j.t.1X("/")===0){j.t="/"+a}L{j.t=j.t.3k(0,j.t.1X("/")+1)+a}}}3 25(k,l){5 m=6.v("29");5 n=6.r("2f");n.2g="2I";6.v(k).s(n);3 2h(a){6.v(\'2n-3f\').2l=a+"?2n=A"}3 1m(a){6.v("1l").D.O="1V";m.D.O="18";m.J=\'<2y 2l="\'+a+\'?2B=\'+2E.2F()+\'" D="20-2H:22%; 20-2K:22%; 2R:2Y; O:18;" />\'}3 23(a,b){5 c=6.r("24");a.s(c);5 d=6.r("19");c.s(d);7(1k(b)){d.J="<x>3x</x>";d.H=3(e){l.15(b);7(6.9.11(\'N\').C>0)6.9.I(a)}}L 7(1q(b)){d.J="<x>2u</x>";d.H=3(e){1m(b);7(6.9.11(\'N\').C>0)6.9.I(a)}}5 f=6.r("19");c.s(f);f.J="<x>2v</x>";f.H=3(e){2h(b);7(6.9.11(\'N\').C>0)6.9.I(a)};5 g=6.r("19");c.s(g);g.J="<x>2w</x>";g.H=3(e){2j(b);7(6.9.11(\'N\').C>0)6.9.I(a)}}3 2k(e,a,b){5 c=6.r("2f");5 d=6.9.1f?6.9.1f:6.1D.1f;5 f=6.9.1g?6.9.1g:6.1D.1g;5 g=1F.1h+f;5 h=1F.1i+d;c.2g=\'N\';c.D.O=\'18\';c.D.2Q=g+\'1I\';c.D.2T=h+\'1I\';23(c,a);6.9.s(c);5 i=c.2U;5 j=c.2W;c.2X=3(e){7(e.1h<g||e.1h>(g+i)||e.1i<h||e.1i>(h+j)){7(6.9.11(\'N\').C>0)6.9.I(c)}}}3 1J(a,b,c){5 d=6.r("19");d.K=(((a=="/")?"":a)+"/"+b);5 f=6.r("x");f.30=b;d.s(f);d.H=3(e){7(1k(d.K.1K())){l.15(d.K)}L 7(1q(d.K.1K())){1m(d.K)}};d.38=3(e){e.3a();e.3b();2k(e,d.K,A)};q d}3 1L(a,b,c){5 d=6.r("24");a.s(d);5 e=c.C;3d(5 i=0;i<e;i++){7(c[i].1a==="1e")d.s(1J(b,c[i].G,c[i].3e))}}3 1k(a){5 b=/(?:\\.([^.]+))?$/.E(a)[1];7(z b!==y){1j(b){8"1O":8"1b":8"1P":8"c":8"1Q":8"1R":8"1S":q A}}q w}3 1q(a){5 b=/(?:\\.([^.]+))?$/.E(a)[1];7(z b!==y){1j(b){8"2q":8"1N":8"2r":q A}}q w}1T.1E=3(a){n.I(n.1U[0]);F(n,"/")};3 1W(a){q 3(){7(o.Y==4){7(o.B!=W){1t("1s["+o.B+"]: "+o.U)}L{n.I(n.1U[0]);F(n,"/")}}}}3 2j(a){o=u T();o.R=1W(a);5 b=u 1c();b.1d("17",a);o.P("2x","/X");o.Q(b)}3 1Y(a,b){q 3(){7(o.Y==4){7(o.B==W)1L(a,b,2z.2A(o.U))}}}3 F(a,b){o=u T(a,b);o.R=1Y(a,b);o.P("1Z","/2C?2D="+b,A);o.Q(1n)}F(n,"/");q 1T}3 21(e,f,g,h,i){3 1o(a){5 b="V";5 c=/(?:\\.([^.]+))?$/.E(a)[1];7(z c!==y){1j(c){8"1O":b="V";12;8"1b":b="1p";12;8"1P":b="2J";12;8"c":b="1r";12;8"1Q":b="1r";12;8"1R":8"2L":8"2M":8"1p":8"2N":8"1S":b=c}}q b}7(z f==="y")f="/2O.1b";7(z g==="y"){g=1o(f)}7(z h==="y")h="2P";7(z i==="y"){i="13/"+g;7(g==="1r")i="13/V"}5 j=1n;5 k=14.X(e);3 10(){7(j.Y==4){7(j.B!=W)1t("1s["+j.B+"]: "+j.U)}}3 26(a,b,c){j=u T();j.R=10;5 d=u 1c();d.1d("1C",u 2S([b],{1a:c}),a);j.P("1M","/X");j.Q(d)}3 27(){7(j.Y==4){6.v("29").D.O="1V";6.v("1l").D.O="18";7(j.B==W)k.28(j.U);L k.28("");k.2V()}}3 F(a){j=u T();j.R=27;j.P("1Z",a,A);j.Q(1n)}7(g!=="V")k.M().2a("14/2b/"+g);k.2Z("14/2c/"+h);k.$31=32;k.M().33(A);k.M().34(2);k.35(A);k.36(w);k.1u.1v({G:\'39\',1w:{1x:\'1y-S\',1z:\'1A-S\'},E:3(a){26(f,a.3g()+"",i)},1B:w});k.1u.1v({G:\'3i\',1w:{1x:\'1y-Z\',1z:\'1A-Z\'},E:3(a){a.M().2m().3l(w)},1B:w});k.1u.1v({G:\'3m\',1w:{1x:\'1y-1G-Z\',1z:\'1A-1G-Z\'},E:3(a){a.M().2m().3o(w)},1B:w});F(f);k.15=3(a){f=a;g=1o(f);i="13/"+g;7(g!=="V")k.M().2a("14/2b/"+g);F(f)};q k}3 3p(){5 c={};5 d=3q.3r.3s.3t(/[?&]+([^=&]+)=([^&]*)/3u,3(m,a,b){c[a]=b});5 e=21("1l",c.1e,c.3v,c.2c);5 f=25("3w",e);2d("2p",f,e)};',62,220,'|||function||var|document|if|case|body|||||||||||||||xmlHttp||return|createElement|appendChild|value|new|getElementById|false|span|undefined|typeof|true|status|length|style|exec|httpGet|name|onclick|removeChild|innerHTML|id|else|getSession|cm|display|open|send|onreadystatechange||XMLHttpRequest|responseText|plain|200|edit|readyState||httpPostProcessRequest|getElementsByClassName|break|text|ace|loadUrl|files|path|block|li|type|htm|FormData|append|file|scrollTop|scrollLeft|clientX|clientY|switch|isTextFile|editor|loadPreview|null|getLangFromFilename|html|isImageFile|c_cpp|ERROR|alert|commands|addCommand|bindKey|win|Ctrl|mac|Command|readOnly|data|documentElement|refreshPath|event|Shift|createPath|px|createTreeLeaf|toLowerCase|addList|POST|jpg|txt|js|cpp|css|xml|this|childNodes|none|delCb|lastIndexOf|getCb|GET|max|createEditor|100|fillFileMenu|ul|createTree|httpPost|httpGetProcessRequest|setValue|preview|setMode|mode|theme|createFileUploader|input|div|className|loadDownload|button|httpDelete|showContextMenu|src|getUndoManager|download|multiple|uploader|png|gif|PUT|Upload|Preview|Download|Delete|DELETE|img|JSON|parse|_cb|list|dir|Date|now|defaultValue|width|tvu|javascript|height|scss|php|json|index|textmate|left|margin|Blob|top|offsetWidth|clearSelection|offsetHeight|onmouseout|auto|setTheme|innerText|blockScrolling|Infinity|setUseSoftTabs|setTabSize|setHighlightActiveLine|setShowPrintMargin|Create|oncontextmenu|saveCommand|preventDefault|stopPropagation|jpeg|for|size|frame|getValue|upload|undoCommand|onchange|substring|undo|redoCommand|indexOf|redo|onBodyLoad|window|location|href|replace|gi|lang|tree|Edit'.split('|'),0,{}))
+</script><script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.9/ace.js" type="text/javascript" charset="utf-8"></script></head><body onload="onBodyLoad();"><div id="uploader"></div><div id="tree"></div><div id="editor"></div><div id="preview" style="display:none;"></div><iframe id=download-frame style='display:none;'></iframe></body></html>
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/src/graphs-src.js b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/graphs-src.js
new file mode 100644
index 000000000..23a295587
--- /dev/null
+++ b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/graphs-src.js
@@ -0,0 +1,281 @@
+/*
+  FSWebServer - Sample Graphing Library
+
+  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
+*/
+function ce(t){ return document.createElement(t); }
+function ac(a,b){ a.appendChild(b); }
+
+function createGraph(el, t, w, h, l, m, ib, tc, cb){
+  if(typeof el === "undefined" || !el) return null;
+  if(typeof ib === "undefined" || !ib) ib = false;
+  w = (w>360)?w:360;
+  h = (h<100)?100:h;
+  var vs = new Array();
+  var bgc = "black";
+  var lc = (typeof tc === "undefined" && tc)?"yellow":tc;
+  var bc = "#444";
+  var vcb = (typeof cb === "undefined" && cb)?null:cb;
+  var minV = m;
+  var maxV = 0;
+  var sv = 1;
+  var ov = l;
+  var gh = h+20;
+  
+  el.style.display = "block";
+  el.style.backgroundColor = "#eee";
+  el.style.border = "1px solid "+bc;
+  el.style.padding = "5px";
+  el.style.margin = "5px";
+  el.style.width = (w+2)+"px";
+  
+  var g = ce("canvas");
+  g.style.border = "1px solid "+bc;
+  g.style.marginTop = "5px";
+  g.width = w;
+  g.height = gh;
+  
+  var c = g.getContext("2d");
+  
+  var sl = ce("span");
+  sl.innerText = "Scale: ";
+  sl.style.paddingLeft = "5px";
+  
+  var st = ce("input");
+  st.type = "text";
+  st.size = 3;
+  st.value = sv;
+  st.onchange = function(e){ sv = st.value; };
+  
+  var sm = ce("button");
+  sm.innerText = "-";
+  sm.onclick = function(e){ if(sv > 1) sv--; st.value = sv; };
+  
+  var sp = ce("button");
+  sp.innerText = "+";
+  sp.onclick = function(e){ sv++; st.value = parseInt(sv); };
+  
+  var ol = ce("span");
+  ol.innerText = "Offset: ";
+  ol.style.paddingLeft = "5px";
+  
+  var ot = ce("input");
+  ot.type = "text";
+  ot.size = 5;
+  ot.value = ov;
+  ot.onchange = function(e){ ov = parseInt(ot.value); };
+  
+  var om = ce("button");
+  om.innerText = "-";
+  om.onclick = function(e){ if(ov > l) ov--; ot.value = ov; };
+  
+  var op = ce("button");
+  op.innerText = "+";
+  op.onclick = function(e){ if(ov < m) ov++; ot.value = ov; };
+  
+  ac(el,sl);
+  ac(el,sm);
+  ac(el,st);
+  ac(el,sp);
+  ac(el,ol);
+  ac(el,om);
+  ac(el,ot);
+  ac(el,op);
+  ac(el,ce("br"));
+  ac(el,g);
+  
+  function scv(v){
+    if(v <= ov) return 0;
+    if(v > (((m - l) / sv) + ov)) return h;
+    return Math.round((v - ov) * (h / ((m - l) / sv)));
+  }
+  
+  g.add = function(v){
+    if(vcb) v = vcb(v);
+    vs.push(v);
+    if(v < minV) minV = v;
+    if(v > maxV) maxV = v;
+    if(vs.length > w) vs.shift();
+    c.canvas.width = w;
+    c.lineWidth = 1;
+    c.shadowBlur=2;
+    c.shadowColor="black";
+    
+    c.fillStyle = bc;
+    c.fillRect(0, 0, w, 20);
+    c.fillStyle = lc;
+    c.font = "14px Verdana";
+    var header = t+": "+(vs[vs.length - 1])+" | Min: "+minV+" | Max: "+maxV;
+    c.fillText(header,5,15);
+    
+    c.fillStyle = bgc;
+    c.fillRect(0, 20, w, gh);
+    c.strokeStyle = lc;
+    
+    for(var i = 0; i < vs.length; i++){
+      if(ib){
+        c.moveTo(i, gh);
+        c.lineTo(i, gh - scv(vs[i]));
+        c.stroke();
+        continue;
+      }
+      if(i === 0){
+        c.moveTo(0, gh - scv(vs[0]));
+        c.lineTo(0, gh - scv(vs[0]));
+        c.stroke();
+      } else {
+        c.moveTo((i - 1), gh - scv(vs[i - 1]));
+        c.lineTo(i, gh - scv(vs[i]));
+        c.stroke();
+      }
+    }
+    c.fillStyle = lc;
+    c.font = "10px Verdana";
+    c.fillText(ov, 2, gh - 5);
+    c.fillText(Math.round((((m - l) / sv) + ov) * 10) / 10, 2, 30);
+  };
+  return g;
+}
+
+function createDigiGraph(el, t, w, h, m, tc){
+  if(typeof el === "undefined" || !el) return null;
+  w = (w>360)?w:360;
+  h = (h<20)?20:h;
+  var vs = new Array();
+  var bgc = "black";
+  var lc = (typeof tc === "undefined" && tc)?"pink":tc;
+  var bc = "#444";
+  var sv = 1;
+  var gh = h+20;
+  
+  el.style.display = "block";
+  el.style.backgroundColor = "#eee";
+  el.style.border = "1px solid "+bc;
+  el.style.padding = "5px";
+  el.style.margin = "5px";
+  el.style.width = (w+2)+"px";
+  
+  var g = ce("canvas");
+  g.style.border = "1px solid "+bc;
+  g.style.marginTop = "5px";
+  g.width = w;
+  g.height = gh;
+  
+  var c = g.getContext("2d");
+  
+  var sl = ce("span");
+  sl.innerText = "Scale: ";
+  sl.style.paddingLeft = "5px";
+  
+  var st = ce("input");
+  st.type = "text";
+  st.size = 3;
+  st.value = sv;
+  st.onchange = function(e){ sv = st.value; };
+  
+  var sm = ce("button");
+  sm.innerText = "-";
+  sm.onclick = function(e){ if(sv > 1) sv--; st.value = sv; };
+  
+  var sp = ce("button");
+  sp.innerText = "+";
+  sp.onclick = function(e){ sv++; st.value = parseInt(sv); };
+  
+  ac(el,sl);
+  ac(el,sm);
+  ac(el,st);
+  ac(el,sp);
+  ac(el,ce("br"));
+  ac(el,g);
+  
+  function gpos(p){
+    var each = Math.floor(((h - ((m.length - 1)*2))/m.length));
+    var s = (p * 2) + (p * each);
+    return [s, s + each];
+  }
+  
+  function gact(i,p){
+    return ((vs[i] & (1 << m[p])) !== 0);;
+  }
+  
+  var vc = ["aqua","yellow","#FF4500","#00FF7F","orange","cyan","magenta","#7FFF00","#FAF0E6","#00CED1","#FFD700","#EE82EE","#00FF00","#00BFFF","#FF4500","#EEE8AA","#FF1493"];
+      
+  g.add = function(v){
+    vs.push(v);
+    if(vs.length > w) vs.shift();
+    c.canvas.width = w;
+    c.lineWidth=1;
+    c.shadowBlur=2;
+    c.shadowColor="black";
+    
+    c.fillStyle = bc;
+    c.fillRect(0, 0, w, 20);
+    c.fillStyle = lc;
+    c.font = "14px Verdana";
+    c.fillText(t,5,15);
+    
+    c.fillStyle = bgc;
+    c.fillRect(0, 20, w, gh);
+    
+    c.strokeStyle = bc;
+    c.lineWidth = 1;
+    c.shadowBlur=0;
+    c.shadowColor="";
+    for(var p=0;p<m.length;p++){
+      var pos = gpos(p);
+      c.moveTo(0, 20 + pos[1] + 1);
+      c.lineTo(w, 20 + pos[1] + 1);
+      c.stroke();
+    }
+    
+    c.shadowBlur=2;
+    c.font = "14px Verdana";
+    var pn = Math.round(w / sv);
+    var stv = w - pn - (w - vs.length);
+    if(stv < 0) stv = 0;
+    for(var i = stv; i < vs.length; i++){
+      for(var p=0;p<m.length;p++){
+        var pos = gpos(p);
+        var act = gact(i, p); 
+        c.fillStyle = vc[p];
+        c.shadowColor="black";
+        c.font = "12px Verdana";
+        c.fillText(""+m[p], 2, pos[0] + 32);
+        c.shadowColor=vc[p];
+        var x1 = ((i-stv)*sv) - (sv / 2);
+        var wa = gact(i - 1, p);
+        if(i && act != wa){
+          if(!wa){
+            c.fillRect(x1, 20 + (pos[1] - 2), sv/2, 2);
+            c.fillRect(x1+(sv/2), 20 + pos[0], 2, pos[1] - pos[0]);
+            c.fillRect(x1+(sv/2), 20 + pos[0], sv/2, 2);
+          } else {
+            c.fillRect(x1, 20 + pos[0], sv/2, 2);
+            c.fillRect(x1+(sv/2), 20 + pos[0], 2, pos[1] - pos[0]);
+            c.fillRect(x1+(sv/2), 20 + (pos[1] - 2), sv/2, 2);
+          }
+        } else if(act){
+          c.fillRect(x1, 20 + pos[0], sv, 2);
+        } else {
+          c.fillRect(x1, 20 + (pos[1] - 2), sv, 2);
+        }
+      }
+    }
+  };
+  return g;
+}
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/src/graphs.js b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/graphs.js
new file mode 100644
index 000000000..b7e878b11
--- /dev/null
+++ b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/graphs.js
@@ -0,0 +1 @@
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('8 H(t){K 21.1Y(t)}8 9(a,b){a.1S(b)}8 1O(b,t,w,h,l,m,d,f,j){6(Q b==="S"||!b)K 1f;6(Q d==="S"||!d)d=1P;w=(w>1b)?w:1b;h=(h<1N)?1N:h;4 k=1M 1L();4 n="V";4 o=(Q f==="S"&&f)?"1J":f;4 p="#1I";4 q=(Q j==="S"&&j)?1f:j;4 r=m;4 s=0;4 u=1;4 x=l;4 y=h+20;b.7.1H="1G";b.7.1F="#1s";b.7.1c="12 11 "+p;b.7.1D="N";b.7.1C="N";b.7.P=(w+2)+"1B";4 g=H("1a");g.7.1c="12 11 "+p;g.7.1z="N";g.P=w;g.1w=y;4 c=g.1v("2d");4 z=H("1j");z.M="1u: ";z.7.1m="N";4 A=H("1p");A.1i="1r";A.1e=3;A.I=u;A.1h=8(e){u=A.I};4 B=H("T");B.M="-";B.U=8(e){6(u>1)u--;A.I=u};4 C=H("T");C.M="+";C.U=8(e){u++;A.I=1n(u)};4 D=H("1j");D.M="1Q: ";D.7.1m="N";4 E=H("1p");E.1i="1r";E.1e=5;E.I=x;E.1h=8(e){x=1n(E.I)};4 F=H("T");F.M="-";F.U=8(e){6(x>l)x--;E.I=x};4 G=H("T");G.M="+";G.U=8(e){6(x<m)x++;E.I=x};9(b,z);9(b,B);9(b,A);9(b,C);9(b,D);9(b,F);9(b,E);9(b,G);9(b,H("1E"));9(b,g);8 R(v){6(v<=x)K 0;6(v>(((m-l)/u)+x))K h;K 1d.1o((v-x)*(h/((m-l)/u)))}g.1x=8(v){6(q)v=q(v);k.1y(v);6(v<r)r=v;6(v>s)s=v;6(k.L>w)k.1A();c.1a.P=w;c.1g=1;c.17=2;c.Y="V";c.O=p;c.J(0,0,w,20);c.O=o;c.X="1q Z";4 a=t+": "+(k[k.L-1])+" | 1U: "+r+" | 23: "+s;c.W(a,5,15);c.O=n;c.J(0,20,w,y);c.1K=o;18(4 i=0;i<k.L;i++){6(d){c.13(i,y);c.14(i,y-R(k[i]));c.16();1R}6(i===0){c.13(0,y-R(k[0]));c.14(0,y-R(k[0]));c.16()}19{c.13((i-1),y-R(k[i-1]));c.14(i,y-R(k[i]));c.16()}}c.O=o;c.X="1T Z";c.W(x,2,y-5);c.W(1d.1o((((m-l)/u)+x)*10)/10,2,1V)};K g}8 1W(j,t,w,h,m,k){6(Q j==="S"||!j)K 1f;w=(w>1b)?w:1b;h=(h<20)?20:h;4 l=1M 1L();4 n="V";4 o=(Q k==="S"&&k)?"1X":k;4 q="#1I";4 r=1;4 u=h+20;j.7.1H="1G";j.7.1F="#1s";j.7.1c="12 11 "+q;j.7.1D="N";j.7.1C="N";j.7.P=(w+2)+"1B";4 g=H("1a");g.7.1c="12 11 "+q;g.7.1z="N";g.P=w;g.1w=u;4 c=g.1v("2d");4 x=H("1j");x.M="1u: ";x.7.1m="N";4 y=H("1p");y.1i="1r";y.1e=3;y.I=r;y.1h=8(e){r=y.I};4 z=H("T");z.M="-";z.U=8(e){6(r>1)r--;y.I=r};4 A=H("T");A.M="+";A.U=8(e){r++;y.I=1n(r)};9(j,x);9(j,z);9(j,y);9(j,A);9(j,H("1E"));9(j,g);8 1l(p){4 a=1d.1Z(((h-((m.L-1)*2))/m.L));4 s=(p*2)+(p*a);K[s,s+a]}8 1k(i,p){K((l[i]&(1<<m[p]))!==0)}4 B=["22","1J","#1t","#24","25","26","27","#28","#29","#2a","#2b","#2c","#2e","#2f","#1t","#2g","#2h"];g.1x=8(v){l.1y(v);6(l.L>w)l.1A();c.1a.P=w;c.1g=1;c.17=2;c.Y="V";c.O=q;c.J(0,0,w,20);c.O=o;c.X="1q Z";c.W(t,5,15);c.O=n;c.J(0,20,w,u);c.1K=q;c.1g=1;c.17=0;c.Y="";18(4 p=0;p<m.L;p++){4 a=1l(p);c.13(0,20+a[1]+1);c.14(w,20+a[1]+1);c.16()}c.17=2;c.X="1q Z";4 b=1d.1o(w/r);4 d=w-b-(w-l.L);6(d<0)d=0;18(4 i=d;i<l.L;i++){18(4 p=0;p<m.L;p++){4 a=1l(p);4 e=1k(i,p);c.O=B[p];c.Y="V";c.X="2i Z";c.W(""+m[p],2,a[0]+2j);c.Y=B[p];4 f=((i-d)*r)-(r/2);4 g=1k(i-1,p);6(i&&e!=g){6(!g){c.J(f,20+(a[1]-2),r/2,2);c.J(f+(r/2),20+a[0],2,a[1]-a[0]);c.J(f+(r/2),20+a[0],r/2,2)}19{c.J(f,20+a[0],r/2,2);c.J(f+(r/2),20+a[0],2,a[1]-a[0]);c.J(f+(r/2),20+(a[1]-2),r/2,2)}}19 6(e){c.J(f,20+a[0],r,2)}19{c.J(f,20+(a[1]-2),r,2)}}}};K g}',62,144,'||||var||if|style|function|ac||||||||||||||||||||||||||||||||||ce|value|fillRect|return|length|innerText|5px|fillStyle|width|typeof|scv|undefined|button|onclick|black|fillText|font|shadowColor|Verdana||solid|1px|moveTo|lineTo||stroke|shadowBlur|for|else|canvas|360|border|Math|size|null|lineWidth|onchange|type|span|gact|gpos|paddingLeft|parseInt|round|input|14px|text|eee|FF4500|Scale|getContext|height|add|push|marginTop|shift|px|margin|padding|br|backgroundColor|block|display|444|yellow|strokeStyle|Array|new|100|createGraph|false|Offset|continue|appendChild|10px|Min|30|createDigiGraph|pink|createElement|floor||document|aqua|Max|00FF7F|orange|cyan|magenta|7FFF00|FAF0E6|00CED1|FFD700|EE82EE||00FF00|00BFFF|EEE8AA|FF1493|12px|32'.split('|'),0,{}))
\ No newline at end of file
diff --git a/libraries/ESP8266WebServer/examples/FSWebServer/data/src/index.htm b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/index.htm
new file mode 100644
index 000000000..03af601ec
--- /dev/null
+++ b/libraries/ESP8266WebServer/examples/FSWebServer/data/src/index.htm
@@ -0,0 +1,100 @@
+<!-- 
+  FSWebServer - Sample 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>ESP Monitor</title>
+  <script type="text/javascript" src="graphs.js"></script>
+  <script type="text/javascript">
+    var heap,temp,digi;
+    var reloadPeriod = 1000;
+    var running = false;
+    
+    function loadValues(){
+      if(!running) return;
+      var xh = new XMLHttpRequest();
+      xh.onreadystatechange = function(){
+        if (xh.readyState == 4){
+          if(xh.status == 200) {
+            var res = JSON.parse(xh.responseText);
+            heap.add(res.heap);
+            temp.add(res.analog);
+            digi.add(res.gpio);
+            if(running) setTimeout(loadValues, reloadPeriod);
+          } else running = false;
+        }
+      };
+      xh.open("GET", "/all", true);
+      xh.send(null);
+    };
+    
+    function run(){
+      if(!running){
+        running = true;
+        loadValues();
+      }
+    }
+    
+    function onBodyLoad(){
+      var refreshInput = document.getElementById("refresh-rate");
+      refreshInput.value = reloadPeriod;
+      refreshInput.onchange = function(e){
+        var value = parseInt(e.target.value);
+        reloadPeriod = (value > 0)?value:0;
+        e.target.value = reloadPeriod;
+      }
+      var stopButton = document.getElementById("stop-button");
+      stopButton.onclick = function(e){
+        running = false;
+      }
+      var startButton = document.getElementById("start-button");
+      startButton.onclick = function(e){
+        run();
+      }
+      
+      // Example with 10K thermistor
+      //function calcThermistor(v) {
+      //  var t = Math.log(((10230000 / v) - 10000));
+      //  t = (1/(0.001129148+(0.000234125*t)+(0.0000000876741*t*t*t)))-273.15;
+      //  return (t>120)?0:Math.round(t*10)/10;
+      //}
+      //temp = createGraph(document.getElementById("analog"), "Temperature", 100, 128, 10, 40, false, "cyan", calcThermistor);
+      
+      temp = createGraph(document.getElementById("analog"), "Analog Input", 100, 128, 0, 1023, false, "cyan");
+      heap = createGraph(document.getElementById("heap"), "Current Heap", 100, 125, 22000, 25000, true, "orange");
+      digi = createDigiGraph(document.getElementById("digital"), "GPIO", 100, 146, [0, 4, 5, 16], "gold");
+      run();
+    }
+  </script>
+</head>
+<body id="index" style="margin:0; padding:0;" onload="onBodyLoad()">
+  <div id="controls" style="display: block; border: 1px solid rgb(68, 68, 68); padding: 5px; margin: 5px; width: 362px; background-color: rgb(238, 238, 238);">
+    <label>Period (ms):</label>
+    <input type="number" id="refresh-rate"/>
+    <input type="button" id="start-button" value="Start"/>
+    <input type="button" id="stop-button" value="Stop"/>
+  </div>
+  <div id="heap"></div>
+  <div id="analog"></div>
+  <div id="digital"></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
index 9f2b16480..0b553b518 100644
--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.h
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -88,6 +88,13 @@ template<typename T> size_t streamFile(T &file, String contentType){
   head += file.size();
   head += "\r\nConnection: close";
   head += "\r\nAccess-Control-Allow-Origin: *";
+  if(
+    String(file.name()).endsWith(".gz") && 
+    contentType != "application/x-gzip" &&
+    contentType != "application/octet-stream"
+  ){
+    head += "\r\nContent-Encoding: gzip";
+  }
   head += "\r\n\r\n";
   _currentClient.print(head);
   head = String();