diff --git a/examples/Async-Server/Async-Server.ino b/examples/Async-Server/Async-Server.ino
index d987a51..8fed51d 100644
--- a/examples/Async-Server/Async-Server.ino
+++ b/examples/Async-Server/Async-Server.ino
@@ -1,31 +1,31 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, your need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show simple page on web server root
- *  - 404 for everything else
- * The server will be run in a separate task, so that you can do your own stuff
- * in the loop() function.
- * Everything else is just like the Static-Page example
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, your need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show simple page on web server root
+    - 404 for everything else
+   The server will be run in a separate task, so that you can do your own stuff
+   in the loop() function.
+   Everything else is just like the Static-Page example
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 /** Check if we have multiple cores */
 #if CONFIG_FREERTOS_UNICORE
-#define ARDUINO_RUNNING_CORE 0
+  #define ARDUINO_RUNNING_CORE    0
 #else
-#define ARDUINO_RUNNING_CORE 1
+  #define ARDUINO_RUNNING_CORE    1
 #endif
 
 // Include certificate data (see note above)
@@ -46,53 +46,15 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// Declare some handler functions for the various URLs on the server
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
-
-// We declare a function that will be the entry-point for the task that is going to be
-// created.
-void serverTask(void *params);
-
-void setup() {
-  // For logging
-  Serial.begin(115200);
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // Setup the server as a separate task.
-  Serial.println("Creating server task... ");
-  // We pass:
-  // serverTask - the function that should be run as separate task
-  // "https443" - a name for the task (mainly used for logging)
-  // 6144       - stack size in byte. If you want up to four clients, you should
-  //              not go below 6kB. If your stack is too small, you will encounter
-  //              Panic and stack canary exceptions, usually during the call to
-  //              SSL_accept.
-  xTaskCreatePinnedToCore(serverTask, "https443", 6144, NULL, 1, NULL, ARDUINO_RUNNING_CORE);
-}
-
-void loop() {
-  Serial.println("loop()");
-  delay(5000);
-}
-
-void serverTask(void *params) {
+void serverTask(void *params) 
+{
   // In the separate task we first do everything that we would have done in the
   // setup() function, if we would run the server synchronously.
 
@@ -112,11 +74,14 @@ void serverTask(void *params) {
 
   Serial.println("Starting server...");
   secureServer.start();
-  if (secureServer.isRunning()) {
+  
+  if (secureServer.isRunning()) 
+  {
     Serial.println("Server ready.");
 
     // "loop()" function of the separate task
-    while(true) {
+    while (true) 
+    {
       // This call will let the server do its work
       secureServer.loop();
 
@@ -126,7 +91,8 @@ void serverTask(void *params) {
   }
 }
 
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+void handleRoot(HTTPRequest * req, HTTPResponse * res) 
+{
   // Status code is 200 OK by default.
   // We want to deliver a simple HTML page, so we send a corresponding content type:
   res->setHeader("Content-Type", "text/html");
@@ -140,13 +106,14 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
   res->println("<h1>Hello World!</h1>");
   res->print("<p>Your server is running for ");
   // A bit of dynamic data: Show the uptime
-  res->print((int)(millis()/1000), DEC);
+  res->print((int)(millis() / 1000), DEC);
   res->println(" seconds.</p>");
   res->println("</body>");
   res->println("</html>");
 }
 
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res) 
+{
   // Discard request body, if we received any
   // We do this, as this is the default node and may also server POST/PUT requests
   req->discardRequestBody();
@@ -165,3 +132,44 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
   res->println("</html>");
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting Async_Server on "); Serial.println(ARDUINO_BOARD);
+
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // Setup the server as a separate task.
+  Serial.println("Creating server task... ");
+  // We pass:
+  // serverTask - the function that should be run as separate task
+  // "https443" - a name for the task (mainly used for logging)
+  // 6144       - stack size in byte. If you want up to four clients, you should
+  //              not go below 6kB. If your stack is too small, you will encounter
+  //              Panic and stack canary exceptions, usually during the call to
+  //              SSL_accept.
+  xTaskCreatePinnedToCore(serverTask, "https443", 6144, NULL, 1, NULL, ARDUINO_RUNNING_CORE);
+}
+
+void loop() 
+{
+  Serial.println("loop()");
+  delay(5000);
+}
diff --git a/examples/Async-Server/cert.h b/examples/Async-Server/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Async-Server/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Async-Server/private_key.h b/examples/Async-Server/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Async-Server/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Authentication/Authentication.ino b/examples/Authentication/Authentication.ino
index 0a1cb2d..a66506d 100644
--- a/examples/Authentication/Authentication.ino
+++ b/examples/Authentication/Authentication.ino
@@ -1,28 +1,28 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, your need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show simple page on web server root
- *  - Provide some "internal pages" that are protected by the server
- *  - Run a middleware that authenticates the user
- *  - Run a middleware that provides access control
- *  - 404 for everything else
- * Authentication is done using HTTP Basic Auth, which is supported by the webserver,
- * so you don't have to care about retrieving the login information from request
- * headers.
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, your need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show simple page on web server root
+    - Provide some "internal pages" that are protected by the server
+    - Run a middleware that authenticates the user
+    - Run a middleware that provides access control
+    - 404 for everything else
+   Authentication is done using HTTP Basic Auth, which is supported by the webserver,
+   so you don't have to care about retrieving the login information from request
+   headers.
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -51,21 +51,14 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 // The contstructor takes some more parameters, but we go for default values here.
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// Declare some handler functions for the various URLs on the server
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handleInternalPage(HTTPRequest * req, HTTPResponse * res);
-void handleAdminPage(HTTPRequest * req, HTTPResponse * res);
-void handlePublicPage(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
-
 // Declare a middleware function.
 // Parameters:
 // req: Request data, can be used to access URL, HTTP Method, Headers, ...
@@ -78,79 +71,23 @@ void handle404(HTTPRequest * req, HTTPResponse * res);
 //       code 403 on the response to show that the user is not allowed to access a specific
 //       resource.
 //       For more details, see the definition below.
-void middlewareAuthentication(HTTPRequest * req, HTTPResponse * res, std::function<void()> next);
-void middlewareAuthorization(HTTPRequest * req, HTTPResponse * res, std::function<void()> next);
-
-void setup() {
-  // For logging
-  Serial.begin(115200);
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // For every resource available on the server, we need to create a ResourceNode
-  // The ResourceNode links URL and HTTP method to a handler function
-  ResourceNode * nodeRoot     = new ResourceNode("/", "GET", &handleRoot);
-  ResourceNode * nodeInternal = new ResourceNode("/internal", "GET", &handleInternalPage);
-  ResourceNode * nodeAdmin    = new ResourceNode("/internal/admin", "GET", &handleAdminPage);
-  ResourceNode * nodePublic   = new ResourceNode("/public", "GET", &handlePublicPage);
-  ResourceNode * node404      = new ResourceNode("", "GET", &handle404);
-
-  // Add the nodes to the server
-  secureServer.registerNode(nodeRoot);
-  secureServer.registerNode(nodeInternal);
-  secureServer.registerNode(nodeAdmin);
-  secureServer.registerNode(nodePublic);
-
-  // Add the 404 not found node to the server.
-  // The path is ignored for the default node.
-  secureServer.setDefaultNode(node404);
-
-  // Add the middleware. These functions will be called globally for every request
-  // Note: The functions are called in the order they are added to the server.
-  // This means, we need to add the authentication middleware first, because the
-  // authorization middleware needs the headers that will be set by the authentication
-  // middleware (First we check the identity, then we see what the user is allowed to do)
-  secureServer.addMiddleware(&middlewareAuthentication);
-  secureServer.addMiddleware(&middlewareAuthorization);
 
-  Serial.println("Starting server...");
-  secureServer.start();
-  if (secureServer.isRunning()) {
-    Serial.println("Server ready.");
-  }
-}
+/**
+   The following middleware function is one of two functions dealing with access control. The
+   middlewareAuthentication() will interpret the HTTP Basic Auth header, check usernames and password,
+   and if they are valid, set the X-USERNAME and X-GROUP header.
 
-void loop() {
-  // This call will let the server do its work
-  secureServer.loop();
+   If they are invalid, the X-USERNAME and X-GROUP header will be unset. This is important because
+   otherwise the client may manipulate those internal headers.
 
-  // Other code would go here...
-  delay(1);
-}
+   Having that done, further middleware functions and the request handler functions will be able to just
+   use req->getHeader("X-USERNAME") to find out if the user is logged in correctly.
 
-/**
- * The following middleware function is one of two functions dealing with access control. The
- * middlewareAuthentication() will interpret the HTTP Basic Auth header, check usernames and password,
- * and if they are valid, set the X-USERNAME and X-GROUP header.
- *
- * If they are invalid, the X-USERNAME and X-GROUP header will be unset. This is important because
- * otherwise the client may manipulate those internal headers.
- *
- * Having that done, further middleware functions and the request handler functions will be able to just
- * use req->getHeader("X-USERNAME") to find out if the user is logged in correctly.
- *
- * Furthermore, if the user supplies credentials and they are invalid, he will receive an 401 response
- * without any other functions being called.
- */
-void middlewareAuthentication(HTTPRequest * req, HTTPResponse * res, std::function<void()> next) {
+   Furthermore, if the user supplies credentials and they are invalid, he will receive an 401 response
+   without any other functions being called.
+*/
+void middlewareAuthentication(HTTPRequest * req, HTTPResponse * res, std::function<void()> next) 
+{
   // Unset both headers to discard any value from the client
   // This prevents authentication bypass by a client that just sets X-USERNAME
   req->setHeader(HEADER_USERNAME, "");
@@ -165,21 +102,29 @@ void middlewareAuthentication(HTTPRequest * req, HTTPResponse * res, std::functi
   std::string reqPassword = req->getBasicAuthPassword();
 
   // If the user entered login information, we will check it
-  if (reqUsername.length() > 0 && reqPassword.length() > 0) {
+  if (reqUsername.length() > 0 && reqPassword.length() > 0) 
+  {
 
     // _Very_ simple hardcoded user database to check credentials and assign the group
     bool authValid = true;
     std::string group = "";
-    if (reqUsername == "admin" && reqPassword == "secret") {
+    
+    if (reqUsername == "admin" && reqPassword == "secret") 
+    {
       group = "ADMIN";
-    } else if (reqUsername == "user" && reqPassword == "test") {
+    } 
+    else if (reqUsername == "user" && reqPassword == "test") 
+    {
       group = "USER";
-    } else {
+    } 
+    else 
+    {
       authValid = false;
     }
 
     // If authentication was successful
-    if (authValid) {
+    if (authValid) 
+    {
       // set custom headers and delegate control
       req->setHeader(HEADER_USERNAME, reqUsername);
       req->setHeader(HEADER_GROUP, group);
@@ -187,7 +132,9 @@ void middlewareAuthentication(HTTPRequest * req, HTTPResponse * res, std::functi
       // The user tried to authenticate and was successful
       // -> We proceed with this request.
       next();
-    } else {
+    } 
+    else 
+    {
       // Display error page
       res->setStatusCode(401);
       res->setStatusText("Unauthorized");
@@ -204,7 +151,9 @@ void middlewareAuthentication(HTTPRequest * req, HTTPResponse * res, std::functi
       // NO CALL TO next() here, as the authentication failed.
       // -> The code above did handle the request already.
     }
-  } else {
+  } 
+  else 
+  {
     // No attempt to authenticate
     // -> Let the request pass through by calling next()
     next();
@@ -212,19 +161,21 @@ void middlewareAuthentication(HTTPRequest * req, HTTPResponse * res, std::functi
 }
 
 /**
- * This function plays together with the middlewareAuthentication(). While the first function checks the
- * username/password combination and stores it in the request, this function makes use of this information
- * to allow or deny access.
- *
- * This example only prevents unauthorized access to every ResourceNode stored under an /internal/... path.
- */
-void middlewareAuthorization(HTTPRequest * req, HTTPResponse * res, std::function<void()> next) {
+   This function plays together with the middlewareAuthentication(). While the first function checks the
+   username/password combination and stores it in the request, this function makes use of this information
+   to allow or deny access.
+
+   This example only prevents unauthorized access to every ResourceNode stored under an /internal/... path.
+*/
+void middlewareAuthorization(HTTPRequest * req, HTTPResponse * res, std::function<void()> next) 
+{
   // Get the username (if any)
   std::string username = req->getHeader(HEADER_USERNAME);
 
   // Check that only logged-in users may get to the internal area (All URLs starting with /internal)
   // Only a simple example, more complicated configuration is up to you.
-  if (username == "" && req->getRequestString().substr(0,9) == "/internal") {
+  if (username == "" && req->getRequestString().substr(0, 9) == "/internal") 
+  {
     // Same as the deny-part in middlewareAuthentication()
     res->setStatusCode(401);
     res->setStatusText("Unauthorized");
@@ -233,7 +184,9 @@ void middlewareAuthorization(HTTPRequest * req, HTTPResponse * res, std::functio
     res->println("401. Unauthorized (try admin/secret or user/test)");
 
     // No call denies access to protected handler function.
-  } else {
+  } 
+  else 
+  {
     // Everything else will be allowed, so we call next()
     next();
   }
@@ -242,7 +195,8 @@ void middlewareAuthorization(HTTPRequest * req, HTTPResponse * res, std::functio
 // This is the internal page. It will greet the user with
 // a personalized message and - if the user is in the ADMIN group -
 // provide a link to the admin interface.
-void handleInternalPage(HTTPRequest * req, HTTPResponse * res) {
+void handleInternalPage(HTTPRequest * req, HTTPResponse * res) 
+{
   // Header
   res->setStatusCode(200);
   res->setStatusText("OK");
@@ -266,7 +220,8 @@ void handleInternalPage(HTTPRequest * req, HTTPResponse * res) {
   res->println("<p>Welcome to the internal area. Congratulations on successfully entering your password!</p>");
 
   // The "admin area" will only be shown if the correct group has been assigned in the authenticationMiddleware
-  if (req->getHeader(HEADER_GROUP) == "ADMIN") {
+  if (req->getHeader(HEADER_GROUP) == "ADMIN") 
+  {
     res->println("<div style=\"border:1px solid red;margin: 20px auto;padding:10px;background:#ff8080\">");
     res->println("<h2>You are an administrator</h2>");
     res->println("<p>You are allowed to access the admin page:</p>");
@@ -280,7 +235,8 @@ void handleInternalPage(HTTPRequest * req, HTTPResponse * res) {
   res->println("</html>");
 }
 
-void handleAdminPage(HTTPRequest * req, HTTPResponse * res) {
+void handleAdminPage(HTTPRequest * req, HTTPResponse * res) 
+{
   // Headers
   res->setHeader("Content-Type", "text/html; charset=utf8");
 
@@ -289,7 +245,8 @@ void handleAdminPage(HTTPRequest * req, HTTPResponse * res) {
 
   // Checking permissions can not only be done centrally in the middleware function but also in the actual request handler.
   // This would be handy if you provide an API with lists of resources, but access rights are defined object-based.
-  if (req->getHeader(HEADER_GROUP) == "ADMIN") {
+  if (req->getHeader(HEADER_GROUP) == "ADMIN") 
+  {
     res->setStatusCode(200);
     res->setStatusText("OK");
     res->printStd(header);
@@ -298,7 +255,9 @@ void handleAdminPage(HTTPRequest * req, HTTPResponse * res) {
     res->println("<p>You found the secret administrator page!</p>");
     res->println("<p><a href=\"/internal\">Go back</a></p>");
     res->println("</div>");
-  } else {
+  } 
+  else 
+  {
     res->printStd(header);
     res->setStatusCode(403);
     res->setStatusText("Unauthorized");
@@ -309,7 +268,8 @@ void handleAdminPage(HTTPRequest * req, HTTPResponse * res) {
 }
 
 // Just a simple page for demonstration, very similar to the root page.
-void handlePublicPage(HTTPRequest * req, HTTPResponse * res) {
+void handlePublicPage(HTTPRequest * req, HTTPResponse * res) 
+{
   res->setHeader("Content-Type", "text/html");
   res->println("<!DOCTYPE html>");
   res->println("<html>");
@@ -317,7 +277,7 @@ void handlePublicPage(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body>");
   res->println("<h1>Hello World!</h1>");
   res->print("<p>Your server is running for ");
-  res->print((int)(millis()/1000), DEC);
+  res->print((int)(millis() / 1000), DEC);
   res->println(" seconds.</p>");
   res->println("<p><a href=\"/\">Go back</a></p>");
   res->println("</body>");
@@ -325,7 +285,8 @@ void handlePublicPage(HTTPRequest * req, HTTPResponse * res) {
 }
 
 // For details on the implementation of the hanlder functions, refer to the Static-Page example.
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+void handleRoot(HTTPRequest * req, HTTPResponse * res) 
+{
   res->setHeader("Content-Type", "text/html");
   res->println("<!DOCTYPE html>");
   res->println("<html>");
@@ -333,13 +294,14 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body>");
   res->println("<h1>Hello World!</h1>");
   res->println("<p>This is the authentication and authorization example. When asked for login "
-      "information, try admin/secret or user/test.</p>");
+               "information, try admin/secret or user/test.</p>");
   res->println("<p>Go to: <a href=\"/internal\">Internal Page</a> | <a href=\"/public\">Public Page</a></p>");
   res->println("</body>");
   res->println("</html>");
 }
 
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res) 
+{
   req->discardRequestBody();
   res->setStatusCode(404);
   res->setStatusText("Not Found");
@@ -350,3 +312,70 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
   res->println("</html>");
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting Authentication on "); Serial.println(ARDUINO_BOARD);
+
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // For every resource available on the server, we need to create a ResourceNode
+  // The ResourceNode links URL and HTTP method to a handler function
+  ResourceNode * nodeRoot     = new ResourceNode("/", "GET", &handleRoot);
+  ResourceNode * nodeInternal = new ResourceNode("/internal", "GET", &handleInternalPage);
+  ResourceNode * nodeAdmin    = new ResourceNode("/internal/admin", "GET", &handleAdminPage);
+  ResourceNode * nodePublic   = new ResourceNode("/public", "GET", &handlePublicPage);
+  ResourceNode * node404      = new ResourceNode("", "GET", &handle404);
+
+  // Add the nodes to the server
+  secureServer.registerNode(nodeRoot);
+  secureServer.registerNode(nodeInternal);
+  secureServer.registerNode(nodeAdmin);
+  secureServer.registerNode(nodePublic);
+
+  // Add the 404 not found node to the server.
+  // The path is ignored for the default node.
+  secureServer.setDefaultNode(node404);
+
+  // Add the middleware. These functions will be called globally for every request
+  // Note: The functions are called in the order they are added to the server.
+  // This means, we need to add the authentication middleware first, because the
+  // authorization middleware needs the headers that will be set by the authentication
+  // middleware (First we check the identity, then we see what the user is allowed to do)
+  secureServer.addMiddleware(&middlewareAuthentication);
+  secureServer.addMiddleware(&middlewareAuthorization);
+
+  Serial.println("Starting server...");
+  secureServer.start();
+  
+  if (secureServer.isRunning()) 
+  {
+    Serial.println("Server ready.");
+  }
+}
+
+void loop() 
+{
+  // This call will let the server do its work
+  secureServer.loop();
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/Authentication/cert.h b/examples/Authentication/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Authentication/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Authentication/private_key.h b/examples/Authentication/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Authentication/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/HTML-Forms/HTML-Forms.ino b/examples/HTML-Forms/HTML-Forms.ino
index b29dfba..d4ca00f 100644
--- a/examples/HTML-Forms/HTML-Forms.ino
+++ b/examples/HTML-Forms/HTML-Forms.ino
@@ -1,24 +1,24 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, you need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show simple page on web server root that includes some HTML Forms
- *  - Define a POST handler that handles the forms using the HTTPBodyParser API
- *    provided by the library.
- *  - 404 for everything else
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, you need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show simple page on web server root that includes some HTML Forms
+    - Define a POST handler that handles the forms using the HTTPBodyParser API
+      provided by the library.
+    - 404 for everything else
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -42,11 +42,11 @@
 
 // We need to specify some content-type mapping, so the resources get delivered with the
 // right content type and are displayed correctly in the browser
-char contentTypes[][2][32] = {
-  {".txt",  "text/plain"},
-  {".html",  "text/html"},
-  {".png",   "image/png"},
-  {".jpg",   "image/jpg"},
+char contentTypes[][2][32] =
+{
+  {".txt", "text/plain"},
+  {".png",  "image/png"},
+  {".jpg",  "image/jpg"},
   {"", ""}
 };
 
@@ -55,33 +55,31 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 // The contstructor takes some more parameters, but we go for default values here.
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// Declare some handler functions for the various URLs on the server
-// See the static-page example for how handler functions work.
-// The comments in setup() describe what each handler function does in this example.
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handleFormUpload(HTTPRequest * req, HTTPResponse * res);
-void handleFormEdit(HTTPRequest * req, HTTPResponse * res);
-void handleFile(HTTPRequest * req, HTTPResponse * res);
-void handleDirectory(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
-
-// As we have a file editor where the content of a file is pasted into a <textarea>,
-// we need to take care of encoding special characters correctly.
-std::string htmlEncode(std::string data) {
-  // Quick and dirty: doesn't handle control chars and such. Don't use it in production code
+// Create some handler functions for the various URLs on the server
+// The signature is always the same for those functions. They get two parameters,
+// which are pointers to the request data (read request body, headers, ...) and
+// to the response data (write response, set status code, ...)
+
+std::string htmlEncode(std::string data) 
+{
+  // Quick and dirty: doesn't handle control chars and such.
   const char *p = data.c_str();
   std::string rv = "";
-  while(p && *p) {
+  
+  while (p && *p) 
+  {
     char escapeChar = *p++;
-    switch(escapeChar) {
+    
+    switch (escapeChar) 
+    {
       case '&': rv += "&amp;"; break;
       case '<': rv += "&lt;"; break;
       case '>': rv += "&gt;"; break;
@@ -91,107 +89,38 @@ std::string htmlEncode(std::string data) {
       default: rv += escapeChar; break;
     }
   }
+  
   return rv;
 }
 
-void setup() {
-  // For logging
-  Serial.begin(115200);
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // Setup filesystem
-  if (!SPIFFS.begin(true)) Serial.println("Mounting SPIFFS failed");
-
-  // For every resource available on the server, we need to create a ResourceNode
-  // The ResourceNode links URL and HTTP method to a handler function
-
-  // The root node shows a static page with a link to the file directory and a small
-  // HTML form that allows uploading new forms
-  ResourceNode * nodeRoot = new ResourceNode("/", "GET", &handleRoot);
-  // The handleFormUpload handler handles the file upload from the root node. As the form
-  // is submitted via post, we need to specify that as handler method here:
-  ResourceNode * nodeFormUpload = new ResourceNode("/upload", "POST", &handleFormUpload);
-
-  // For the editor, we use the same handler function and register it with the GET and POST
-  // method. The handler decides what to do based on the method used to call it:
-  ResourceNode * nodeFormEdit = new ResourceNode("/edit", "GET", &handleFormEdit);
-  ResourceNode * nodeFormEditDone = new ResourceNode("/edit", "POST", &handleFormEdit);
-
-  // To keep track of all uploaded files, we provide a directory listing here with an edit
-  // button for text-based files:
-  ResourceNode * nodeDirectory = new ResourceNode("/public", "GET", &handleDirectory);
-
-  // And of course we need some way to retrieve the file again. We use the placeholder
-  // feature in the path to do so:
-  ResourceNode * nodeFile = new ResourceNode("/public/*", "GET", &handleFile);
-
-  // 404 node has no URL as it is used for all requests that don't match anything else
-  ResourceNode * node404  = new ResourceNode("", "GET", &handle404);
-
-  // Add all nodes to the server so they become accessible:
-  secureServer.registerNode(nodeRoot);
-  secureServer.registerNode(nodeFormUpload);
-  secureServer.registerNode(nodeFormEdit);
-  secureServer.registerNode(nodeFormEditDone);
-  secureServer.registerNode(nodeDirectory);
-  secureServer.registerNode(nodeFile);
-  secureServer.setDefaultNode(node404);
-
-  Serial.println("Starting server...");
-  secureServer.start();
-  if (secureServer.isRunning()) {
-    Serial.println("Server ready.");
-  }
-}
-
-void loop() {
-  // This call will let the server do its work
-  secureServer.loop();
-
-  // Other code would go here...
-  delay(1);
-}
-
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+void handleRoot(HTTPRequest * req, HTTPResponse * res) 
+{
   // Status code is 200 OK by default.
   // We want to deliver a simple HTML page, so we send a corresponding content type:
   res->setHeader("Content-Type", "text/html");
 
-  // Just the regular HTML document structure, nothing special to forms here....
+  // The response implements the Print interface, so you can use it just like
+  // you would write to Serial etc.
   res->println("<!DOCTYPE html>");
   res->println("<html>");
   res->println("<head><title>Very simple file server</title></head>");
   res->println("<body>");
   res->println("<h1>Very simple file server</h1>");
   res->println("<p>This is a very simple file server to demonstrate the use of POST forms. </p>");
-
-  // The link to the file listing (/public is produced by handleDirectory())
   res->println("<h2>List existing files</h2>");
   res->println("<p>See <a href=\"/public\">/public</a> to list existing files and retrieve or edit them.</p>");
-
-  // Here comes the upload form. Note the enctype="multipart/form-data". Only by setting that enctype, you
-  // will be able to upload a file. If you miss it, the file field will only contain the filename.
-  // Method is POST, which matches the way that nodeFormUpload is configured in setup().
   res->println("<h2>Upload new file</h2>");
   res->println("<p>This form allows you to upload files (text, jpg and png supported best). It demonstrates multipart/form-data.</p>");
   res->println("<form method=\"POST\" action=\"/upload\" enctype=\"multipart/form-data\">");
   res->println("file: <input type=\"file\" name=\"file\"><br>");
   res->println("<input type=\"submit\" value=\"Upload\">");
   res->println("</form>");
-
   res->println("</body>");
   res->println("</html>");
 }
 
-void handleFormUpload(HTTPRequest * req, HTTPResponse * res) {
+void handleFormUpload(HTTPRequest * req, HTTPResponse * res) 
+{
   // First, we need to check the encoding of the form that we have received.
   // The browser will set the Content-Type request header, so we can use it for that purpose.
   // Then we select the body parser based on the encoding.
@@ -199,247 +128,220 @@ void handleFormUpload(HTTPRequest * req, HTTPResponse * res) {
   // to be multipart/form-data.
   HTTPBodyParser *parser;
   std::string contentType = req->getHeader("Content-Type");
-
-  // The content type may have additional properties after a semicolon, for exampel:
-  // Content-Type: text/html;charset=utf-8
-  // Content-Type: multipart/form-data;boundary=------s0m3w31rdch4r4c73rs
-  // As we're interested only in the actual mime _type_, we strip everything after the
-  // first semicolon, if one exists:
   size_t semicolonPos = contentType.find(";");
-  if (semicolonPos != std::string::npos) {
+  
+  if (semicolonPos != std::string::npos) 
+  {
     contentType = contentType.substr(0, semicolonPos);
   }
-
-  // Now, we can decide based on the content type:
-  if (contentType == "multipart/form-data") {
+  
+  if (contentType == "multipart/form-data") 
+  {
     parser = new HTTPMultipartBodyParser(req);
-  } else {
+  } 
+  else 
+  {
     Serial.printf("Unknown POST Content-Type: %s\n", contentType.c_str());
+    
     return;
   }
-
+  
+  // We iterate over the fields. Any field with a filename is uploaded
   res->println("<html><head><title>File Upload</title></head><body><h1>File Upload</h1>");
-
-  // We iterate over the fields. Any field with a filename is uploaded.
-  // Note that the BodyParser consumes the request body, meaning that you can iterate over the request's
-  // fields only a single time. The reason for this is that it allows you to handle large requests
-  // which would not fit into memory.
   bool didwrite = false;
-
-  // parser->nextField() will move the parser to the next field in the request body (field meaning a
-  // form field, if you take the HTML perspective). After the last field has been processed, nextField()
-  // returns false and the while loop ends.
-  while(parser->nextField()) {
-    // For Multipart data, each field has three properties:
-    // The name ("name" value of the <input> tag)
-    // The filename (If it was a <input type="file">, this is the filename on the machine of the
-    //   user uploading it)
-    // The mime type (It is determined by the client. So do not trust this value and blindly start
-    //   parsing files only if the type matches)
+  
+  while (parser->nextField()) 
+  {
     std::string name = parser->getFieldName();
     std::string filename = parser->getFieldFilename();
     std::string mimeType = parser->getFieldMimeType();
-    // We log all three values, so that you can observe the upload on the serial monitor:
     Serial.printf("handleFormUpload: field name='%s', filename='%s', mimetype='%s'\n", name.c_str(), filename.c_str(), mimeType.c_str());
-
+    
     // Double check that it is what we expect
-    if (name != "file") {
+    if (name != "file") 
+    {
       Serial.println("Skipping unexpected field");
       break;
     }
-
-    // You should check file name validity and all that, but we skip that to make the core
-    // concepts of the body parser functionality easier to understand.
+    
+    // Should check file name validity and all that, but we skip that.
     std::string pathname = "/public/" + filename;
-
-    // Create a new file on spiffs to stream the data into
     File file = SPIFFS.open(pathname.c_str(), "w");
     size_t fileLength = 0;
     didwrite = true;
-
-    // With endOfField you can check whether the end of field has been reached or if there's
-    // still data pending. With multipart bodies, you cannot know the field size in advance.
-    while (!parser->endOfField()) {
+    
+    while (!parser->endOfField()) 
+    {
       byte buf[512];
       size_t readLength = parser->read(buf, 512);
       file.write(buf, readLength);
       fileLength += readLength;
     }
+    
     file.close();
     res->printf("<p>Saved %d bytes to %s</p>", (int)fileLength, pathname.c_str());
   }
-  if (!didwrite) {
+  
+  if (!didwrite) 
+  {
     res->println("<p>Did not write any file</p>");
   }
+  
   res->println("</body></html>");
   delete parser;
 }
 
-void handleFormEdit(HTTPRequest * req, HTTPResponse * res) {
-  // This handler function does two things:
-  // For GET: Show an editor
-  // For POST: Handle editor submit
-  if (req->getMethod() == "GET") {
+void handleFormEdit(HTTPRequest * req, HTTPResponse * res) 
+{
+  if (req->getMethod() == "GET") 
+  {
     // Initial request. Get filename from request parameters and return form.
-    // The filename is in the URL, so we need to use the query params here:
-    // (URL is like /edit?filename=something.txt)
     auto params = req->getParams();
     std::string filename;
     bool hasFilename = params->getQueryParameter("filename", filename);
     std::string pathname = std::string("/public/") + filename;
-
-    // Start writing the HTML output
     res->println("<html><head><title>Edit File</title><head><body>");
-
-    // Try to open the file from SPIFFS
     File file = SPIFFS.open(pathname.c_str());
-    if (!hasFilename) {
-      // No ?filename=something parameter was given
+    
+    if (!hasFilename) 
+    {
       res->println("<p>No filename specified.</p>");
-
-    } else if (!file.available()) {
-      // The file didn't exist in the SPIFFS
+    } 
+    else if (!file.available()) 
+    {
       res->printf("<p>File not found: %s</p>\n", pathname.c_str());
-
-    } else {
-      // We have a file, render the form:
+    } 
+    else 
+    {
       res->printf("<h2>Edit content of %s</h2>\n", pathname.c_str());
-
-      // Start writing the form. The file content will be shown in a <textarea>, so there is
-      // no file upload happening (from the HTML perspective). For that reason, we use the
-      // x-www-form-urlencoded enctype as it is much more efficient:
       res->println("<form method=\"POST\" enctype=\"application/x-www-form-urlencoded\">");
-
-      // Store the filename hidden in the form so that we know which file to update when the form
-      // is submitted
       res->printf("<input name=\"filename\" type=\"hidden\" value=\"%s\">", filename.c_str());
       res->print("<textarea name=\"content\" rows=\"24\" cols=\"80\">");
       
-      // Read the file from SPIFFS and write it to the HTTP response body
+      // Read the file and write it to the response
       size_t length = 0;
-      do {
+      
+      do
+      {
         char buffer[256];
         length = file.read((uint8_t *)buffer, 256);
         std::string bufferString(buffer, length);
-        // htmlEncode handles conversions of < to &lt; so that the form is rendered correctly
         bufferString = htmlEncode(bufferString);
         res->write((uint8_t *)bufferString.c_str(), bufferString.size());
       } while (length > 0);
-
-      // Finalize the form with a submitt button
+      
       res->println("</textarea><br>");
       res->println("<input type=\"submit\" value=\"Save\">");
       res->println("</form>");
     }
+    
     res->println("</body></html>");
-
-  } else { // method != GET
+  } 
+  else 
+  { 
+    // method != GET
     // Assume POST request. Contains submitted data.
     res->println("<html><head><title>File Edited</title><head><body><h1>File Edited</h1>");
-
-    // The form is submitted with the x-www-form-urlencoded content type, so we need the
-    // HTTPURLEncodedBodyParser to read the fields.
-    // Note that the content of the file's content comes from a <textarea>, so we
-    // can use the URL encoding here, since no file upload from an <input type="file"
-    // is involved.
     HTTPURLEncodedBodyParser parser(req);
-
-    // The bodyparser will consume the request body. That means you can iterate over the
-    // fields only ones. For that reason, we need to create variables for all fields that
-    // we expect. So when parsing is done, you can process the field values from your
-    // temporary variables.
     std::string filename;
     bool savedFile = false;
     
-    // Iterate over the fields from the request body by calling nextField(). This function
-    // will update the field name and value of the body parsers. If the last field has been
-    // reached, it will return false and the while loop stops.
-    while(parser.nextField()) {
-      // Get the field name, so that we can decide what the value is for
+    while (parser.nextField()) 
+    {
       std::string name = parser.getFieldName();
-
-      if (name == "filename") {
-        // Read the filename from the field's value, add the /public prefix and store it in
-        // the filename variable.
+      
+      if (name == "filename") 
+      {
         char buf[512];
         size_t readLength = parser.read((byte *)buf, 512);
         filename = std::string("/public/") + std::string(buf, readLength);
-
-      } else if (name == "content") {
-        // Browsers must return the fields in the order that they are placed in
-        // the HTML form, so if the broweser behaves correctly, this condition will
-        // never be true. We include it for safety reasons.
-        if (filename == "") {
+      } 
+      else if (name == "content") 
+      {
+        if (filename == "") 
+        {
           res->println("<p>Error: form contained content before filename.</p>");
           break;
         }
-
-        // With parser.read() and parser.endOfField(), we can stream the field content
-        // into a buffer. That allows handling arbitrarily-sized field contents. Here,
-        // we use it and write the file contents directly to the SPIFFS:
+        
         size_t fieldLength = 0;
         File file = SPIFFS.open(filename.c_str(), "w");
         savedFile = true;
-        while (!parser.endOfField()) {
+        
+        while (!parser.endOfField()) 
+        {
           byte buf[512];
           size_t readLength = parser.read(buf, 512);
           file.write(buf, readLength);
           fieldLength += readLength;
         }
+        
         file.close();
         res->printf("<p>Saved %d bytes to %s</p>", int(fieldLength), filename.c_str());
-
-      } else {
+      } 
+      else 
+      {
         res->printf("<p>Unexpected field %s</p>", name.c_str());
       }
     }
-    if (!savedFile) {
+    
+    if (!savedFile) 
+    {
       res->println("<p>No file to save...</p>");
     }
+    
     res->println("</body></html>");
   }
 }
 
-void handleDirectory(HTTPRequest * req, HTTPResponse * res) {
+void handleDirectory(HTTPRequest * req, HTTPResponse * res) 
+{
   res->println("<html><head><title>File Listing</title><head><body>");
-
-  // We read the SPIFFS folder public and render all files to the HTML page:
   File d = SPIFFS.open("/public");
-
-  if (!d.isDirectory()) {
+  
+  if (!d.isDirectory()) 
+  {
     res->println("<p>No files found.</p>");
-  } else {
+  } 
+  else 
+  {
     res->println("<h1>File Listing</h1>");
     res->println("<ul>");
+    
     File f = d.openNextFile();
-    while (f) {
+    
+    while (f) 
+    {
       std::string pathname(f.name());
-
-      // We render a link to /public/... for each file that we find
       res->printf("<li><a href=\"%s\">%s</a>", pathname.c_str(), pathname.c_str());
-
-      if (pathname.rfind(".txt") != std::string::npos) {
-        // And if the file is a text file, we also include an editor link like
-        // /edit?filename=... to open the editor, which is created by handleFormEdit.
+      
+      if (pathname.rfind(".txt") != std::string::npos) 
+      {
         std::string filename = pathname.substr(8); // Remove /public/
         res->printf(" <a href=\"/edit?filename=%s\">[edit]</a>", filename.c_str());
       }
+      
       res->println("</li>");
       f = d.openNextFile();
     }
+    
     res->println("</ul>");
   }
   res->println("</body></html>");
 }
 
-void handleFile(HTTPRequest * req, HTTPResponse * res) {
+void handleFile(HTTPRequest * req, HTTPResponse * res) 
+{
   std::string filename = req->getRequestString();
+  
   // Check if the file exists
-  if (!SPIFFS.exists(filename.c_str())) {
+  if (!SPIFFS.exists(filename.c_str())) 
+  {
     // Send "404 Not Found" as response, as the file doesn't seem to exist
     res->setStatusCode(404);
     res->setStatusText("Not found");
     res->println("404 Not Found");
+    
     return;
   }
 
@@ -450,18 +352,24 @@ void handleFile(HTTPRequest * req, HTTPResponse * res) {
 
   // Content-Type is guessed using the definition of the contentTypes-table defined above
   int cTypeIdx = 0;
-  do {
-    if(filename.rfind(contentTypes[cTypeIdx][0])!=std::string::npos) {
+  
+  do 
+  {
+    if (filename.rfind(contentTypes[cTypeIdx][0]) != std::string::npos) 
+    {
       res->setHeader("Content-Type", contentTypes[cTypeIdx][1]);
       break;
     }
-    cTypeIdx+=1;
-  } while(strlen(contentTypes[cTypeIdx][0])>0);
+    
+    cTypeIdx += 1;
+  } while (strlen(contentTypes[cTypeIdx][0]) > 0);
 
   // Read the file and write it to the response
   uint8_t buffer[256];
   size_t length = 0;
-  do {
+  
+  do 
+  {
     length = file.read(buffer, 256);
     res->write(buffer, length);
   } while (length > 0);
@@ -469,7 +377,8 @@ void handleFile(HTTPRequest * req, HTTPResponse * res) {
   file.close();
 }
 
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res) 
+{
   // Discard request body, if we received any
   // We do this, as this is the default node and may also server POST/PUT requests
   req->discardRequestBody();
@@ -488,3 +397,71 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
   res->println("</html>");
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting HTML_Forms on "); Serial.println(ARDUINO_BOARD);
+  
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // Setup filesystem
+  if (!SPIFFS.begin(true)) Serial.println("Mounting SPIFFS failed");
+
+  // For every resource available on the server, we need to create a ResourceNode
+  // The ResourceNode links URL and HTTP method to a handler function
+  ResourceNode * nodeRoot = new ResourceNode("/", "GET", &handleRoot);
+  ResourceNode * nodeFormUpload = new ResourceNode("/upload", "POST", &handleFormUpload);
+  ResourceNode * nodeFormEdit = new ResourceNode("/edit", "GET", &handleFormEdit);
+  ResourceNode * nodeFormEditDone = new ResourceNode("/edit", "POST", &handleFormEdit);
+  ResourceNode * nodeDirectory = new ResourceNode("/public", "GET", &handleDirectory);
+  ResourceNode * nodeFile = new ResourceNode("/public/*", "GET", &handleFile);
+
+  // 404 node has no URL as it is used for all requests that don't match anything else
+  ResourceNode * node404  = new ResourceNode("", "GET", &handle404);
+
+  // Add the root nodes to the server
+  secureServer.registerNode(nodeRoot);
+  secureServer.registerNode(nodeFormUpload);
+  secureServer.registerNode(nodeFormEdit);
+  secureServer.registerNode(nodeFormEditDone);
+  secureServer.registerNode(nodeDirectory);
+  secureServer.registerNode(nodeFile);
+
+  // Add the 404 not found node to the server.
+  // The path is ignored for the default node.
+  secureServer.setDefaultNode(node404);
+
+  Serial.println("Starting server...");
+  secureServer.start();
+  
+  if (secureServer.isRunning()) 
+  {
+    Serial.println("Server ready.");
+  }
+}
+
+void loop() 
+{
+  // This call will let the server do its work
+  secureServer.loop();
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/HTML-Forms/cert.h b/examples/HTML-Forms/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/HTML-Forms/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/HTML-Forms/private_key.h b/examples/HTML-Forms/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/HTML-Forms/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/HTTPS-and-HTTP/HTTPS-and-HTTP.ino b/examples/HTTPS-and-HTTP/HTTPS-and-HTTP.ino
index 0097103..ca375da 100644
--- a/examples/HTTPS-and-HTTP/HTTPS-and-HTTP.ino
+++ b/examples/HTTPS-and-HTTP/HTTPS-and-HTTP.ino
@@ -1,25 +1,25 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, your need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTP Server on port 80 and an HTTPS server
- * on port 443 of your ESP32 with the following functionalities:
- *  - Show simple page on web server root
- *  - 404 for everything else
- *
- * The comments in this script focus on making both protocols available,
- * for setting up the server itself, see Static-Page.
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, your need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTP Server on port 80 and an HTTPS server
+   on port 443 of your ESP32 with the following functionalities:
+    - Show simple page on web server root
+    - 404 for everything else
+
+   The comments in this script focus on making both protocols available,
+   for setting up the server itself, see Static-Page.
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -41,9 +41,9 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // First, we create the HTTPSServer with the certificate created above
 HTTPSServer secureServer = HTTPSServer(&cert);
@@ -51,21 +51,72 @@ HTTPSServer secureServer = HTTPSServer(&cert);
 // Additionally, we create an HTTPServer for unencrypted traffic
 HTTPServer insecureServer = HTTPServer();
 
-// Declare some handler functions for the various URLs on the server
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
+// The hanlder functions are the same as in the Static-Page example.
+// The only difference is the check for isSecure in the root handler
+
+void handleRoot(HTTPRequest * req, HTTPResponse * res)
+{
+  res->setHeader("Content-Type", "text/html");
+
+  res->println("<!DOCTYPE html>");
+  res->println("<html>");
+  res->println("<head><title>Hello World!</title></head>");
+  res->println("<body>");
+  res->println("<h1>Hello World!</h1>");
+
+  res->print("<p>Your server is running for ");
+  res->print((int)(millis() / 1000), DEC);
+  res->println(" seconds.</p>");
+
+  // You can check if you are connected over a secure connection, eg. if you
+  // want to use authentication and redirect the user to a secure connection
+  // for that
+  if (req->isSecure()) 
+  {
+    res->println("<p>You are connected via <strong>HTTPS</strong>.</p>");
+  } 
+  else 
+  {
+    res->println("<p>You are connected via <strong>HTTP</strong>.</p>");
+  }
+
+  res->println("</body>");
+  res->println("</html>");
+}
+
+void handle404(HTTPRequest * req, HTTPResponse * res)
+{
+  req->discardRequestBody();
+  res->setStatusCode(404);
+  res->setStatusText("Not Found");
+  res->setHeader("Content-Type", "text/html");
+  res->println("<!DOCTYPE html>");
+  res->println("<html>");
+  res->println("<head><title>Not Found</title></head>");
+  res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
+  res->println("</html>");
+}
 
-void setup() {
+void setup() 
+{
   // For logging
   Serial.begin(115200);
+  while (!Serial && millis() < 5000);
 
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting HTTPS_and_HTTP on "); Serial.println(ARDUINO_BOARD);
+  
   // Connect to WiFi
   Serial.println("Setting up WiFi");
   WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
     Serial.print(".");
     delay(500);
   }
+  
   Serial.print("Connected. IP=");
   Serial.println(WiFi.localIP());
 
@@ -87,12 +138,15 @@ void setup() {
   secureServer.start();
   Serial.println("Starting HTTP server...");
   insecureServer.start();
-  if (secureServer.isRunning() && insecureServer.isRunning()) {
+  
+  if (secureServer.isRunning() && insecureServer.isRunning()) 
+  {
     Serial.println("Servers ready.");
   }
 }
 
-void loop() {
+void loop() 
+{
   // We need to call both loop functions here
   secureServer.loop();
   insecureServer.loop();
@@ -100,44 +154,3 @@ void loop() {
   // Other code would go here...
   delay(1);
 }
-
-// The hanlder functions are the same as in the Static-Page example.
-// The only difference is the check for isSecure in the root handler
-
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
-  res->setHeader("Content-Type", "text/html");
-
-  res->println("<!DOCTYPE html>");
-  res->println("<html>");
-  res->println("<head><title>Hello World!</title></head>");
-  res->println("<body>");
-  res->println("<h1>Hello World!</h1>");
-
-  res->print("<p>Your server is running for ");
-  res->print((int)(millis()/1000), DEC);
-  res->println(" seconds.</p>");
-
-  // You can check if you are connected over a secure connection, eg. if you
-  // want to use authentication and redirect the user to a secure connection
-  // for that
-  if (req->isSecure()) {
-    res->println("<p>You are connected via <strong>HTTPS</strong>.</p>");
-  } else {
-    res->println("<p>You are connected via <strong>HTTP</strong>.</p>");
-  }
-
-  res->println("</body>");
-  res->println("</html>");
-}
-
-void handle404(HTTPRequest * req, HTTPResponse * res) {
-  req->discardRequestBody();
-  res->setStatusCode(404);
-  res->setStatusText("Not Found");
-  res->setHeader("Content-Type", "text/html");
-  res->println("<!DOCTYPE html>");
-  res->println("<html>");
-  res->println("<head><title>Not Found</title></head>");
-  res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
-  res->println("</html>");
-}
diff --git a/examples/HTTPS-and-HTTP/cert.h b/examples/HTTPS-and-HTTP/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/HTTPS-and-HTTP/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/HTTPS-and-HTTP/private_key.h b/examples/HTTPS-and-HTTP/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/HTTPS-and-HTTP/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Middleware/Middleware.ino b/examples/Middleware/Middleware.ino
index 560f6f6..854933a 100644
--- a/examples/Middleware/Middleware.ino
+++ b/examples/Middleware/Middleware.ino
@@ -1,23 +1,23 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, your need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show simple page on web server root
- *  - Run a middleware that logs every request
- *  - 404 for everything else
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, your need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show simple page on web server root
+    - Run a middleware that logs every request
+    - 404 for everything else
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -40,18 +40,14 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 // The contstructor takes some more parameters, but we go for default values here.
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// Declare some handler functions for the various URLs on the server
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
-
 // Declare a middleware function.
 // Parameters:
 // req: Request data, can be used to access URL, HTTP Method, Headers, ...
@@ -64,19 +60,74 @@ void handle404(HTTPRequest * req, HTTPResponse * res);
 //       code 403 on the response to show that the user is not allowed to access a specific
 //       resource.
 //       The Authentication examples provides more details on this.
-void middlewareLogging(HTTPRequest * req, HTTPResponse * res, std::function<void()> next);
+// We want to log the following information for every request:
+// - Response Status
+// - Request Method
+// - Request String (URL + Parameters)
+void middlewareLogging(HTTPRequest * req, HTTPResponse * res, std::function<void()> next)
+{
+  // We want to print the response status, so we need to call next() first.
+  next();
+  // After the call, the status is (hopefully) set by the handler function, so we can
+  // access it for logging.
+  Serial.printf("middlewareLogging(): %3d\t%s\t\t%s\n",
+                // Status code (like: 200)
+                res->getStatusCode(),
+                // Method used for the request (like: GET)
+                req->getMethod().c_str(),
+                // Request string (like /index.html)
+                req->getRequestString().c_str());
+}
+
+// For details on the implementation of the hanlder functions, refer to the Static-Page example.
+void handleRoot(HTTPRequest * req, HTTPResponse * res)
+{
+  res->setHeader("Content-Type", "text/html");
+  res->println("<!DOCTYPE html>");
+  res->println("<html>");
+  res->println("<head><title>Hello World!</title></head>");
+  res->println("<body>");
+  res->println("<h1>Hello World!</h1>");
+  res->print("<p>Your server is running for ");
+  res->print((int)(millis() / 1000), DEC);
+  res->println(" seconds.</p>");
+  res->println("</body>");
+  res->println("</html>");
+}
+
+void handle404(HTTPRequest * req, HTTPResponse * res) 
+{
+  req->discardRequestBody();
+  res->setStatusCode(404);
+  res->setStatusText("Not Found");
+  res->setHeader("Content-Type", "text/html");
+  res->println("<!DOCTYPE html>");
+  res->println("<html>");
+  res->println("<head><title>Not Found</title></head>");
+  res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
+  res->println("</html>");
+}
 
-void setup() {
+void setup() 
+{
   // For logging
   Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
 
+  Serial.print("\nStarting Middleware on "); Serial.println(ARDUINO_BOARD);
+  
   // Connect to WiFi
   Serial.println("Setting up WiFi");
   WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
     Serial.print(".");
     delay(500);
   }
+  
   Serial.print("Connected. IP=");
   Serial.println(WiFi.localIP());
 
@@ -100,60 +151,18 @@ void setup() {
 
   Serial.println("Starting server...");
   secureServer.start();
-  if (secureServer.isRunning()) {
+  
+  if (secureServer.isRunning()) 
+  {
     Serial.println("Server ready.");
   }
 }
 
-void loop() {
+void loop() 
+{
   // This call will let the server do its work
   secureServer.loop();
 
   // Other code would go here...
   delay(1);
 }
-
-// We want to log the following information for every request:
-// - Response Status
-// - Request Method
-// - Request String (URL + Parameters)
-void middlewareLogging(HTTPRequest * req, HTTPResponse * res, std::function<void()> next) {
-  // We want to print the response status, so we need to call next() first.
-  next();
-  // After the call, the status is (hopefully) set by the handler function, so we can
-  // access it for logging.
-  Serial.printf("middlewareLogging(): %3d\t%s\t\t%s\n",
-      // Status code (like: 200)
-      res->getStatusCode(),
-      // Method used for the request (like: GET)
-      req->getMethod().c_str(),
-      // Request string (like /index.html)
-      req->getRequestString().c_str());
-}
-
-// For details on the implementation of the hanlder functions, refer to the Static-Page example.
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
-  res->setHeader("Content-Type", "text/html");
-  res->println("<!DOCTYPE html>");
-  res->println("<html>");
-  res->println("<head><title>Hello World!</title></head>");
-  res->println("<body>");
-  res->println("<h1>Hello World!</h1>");
-  res->print("<p>Your server is running for ");
-  res->print((int)(millis()/1000), DEC);
-  res->println(" seconds.</p>");
-  res->println("</body>");
-  res->println("</html>");
-}
-
-void handle404(HTTPRequest * req, HTTPResponse * res) {
-  req->discardRequestBody();
-  res->setStatusCode(404);
-  res->setStatusText("Not Found");
-  res->setHeader("Content-Type", "text/html");
-  res->println("<!DOCTYPE html>");
-  res->println("<html>");
-  res->println("<head><title>Not Found</title></head>");
-  res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
-  res->println("</html>");
-}
diff --git a/examples/Middleware/cert.h b/examples/Middleware/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Middleware/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Middleware/private_key.h b/examples/Middleware/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Middleware/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Parameter-Validation/Parameter-Validation.ino b/examples/Parameter-Validation/Parameter-Validation.ino
index a993da4..eafbd3e 100644
--- a/examples/Parameter-Validation/Parameter-Validation.ino
+++ b/examples/Parameter-Validation/Parameter-Validation.ino
@@ -1,25 +1,25 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, you need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Shows you a page with some LEDs and allow you to turn them on or off
- *    Parameters for the URLs are checked, so that you cannot address non-existing objects
- *  - 404 for everything else
- * If you want to see the LEDs, connect them to GPIOs 33 (red), 25 (yellow), 26 (green)
- * and 27 (blue).
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, you need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Shows you a page with some LEDs and allow you to turn them on or off
+      Parameters for the URLs are checked, so that you cannot address non-existing objects
+    - 404 for everything else
+   If you want to see the LEDs, connect them to GPIOs 33 (red), 25 (yellow), 26 (green)
+   and 27 (blue).
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -43,137 +43,52 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 // The contstructor takes some more parameters, but we go for default values here.
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// Root node, will show the LEDs that are available
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-
-// Node to switch an LED on or off
-void handleSwitch(HTTPRequest * req, HTTPResponse * res);
-
-// Validation function for the LED ID and state, explanation follows below.
-bool validateLEDState(std::string s);
-bool validateLEDID(std::string s);
-
-// Default handler for resources that do not exist
-void handle404(HTTPRequest * req, HTTPResponse * res);
-
 // A class that defines an LED
-class LED {
-public:
-  /** Name for the LED */
-  const std::string _name;
-  /** Pin that it's connected to */
-  const uint8_t _pin;
-  /** Current state */
-  bool _on;
-  /** Constructor */
-  LED(const std::string name, uint8_t pin): _name(name), _pin(pin) {
-    _on = false;
-    pinMode(pin, OUTPUT);
-  }
-  /** Method to turn the led on or of */
-  void setOn(bool on) {
-    digitalWrite(_pin,on?HIGH:LOW);
-    _on=on;
-  }
+class LED
+{
+  public:
+    /** Name for the LED */
+    const std::string _name;
+    /** Pin that it's connected to */
+    const uint8_t _pin;
+    /** Current state */
+    bool _on;
+    /** Constructor */
+    LED(const std::string name, uint8_t pin): _name(name), _pin(pin) 
+    {
+      _on = false;
+      pinMode(pin, OUTPUT);
+    }
+    
+    /** Method to turn the led on or of */
+    void setOn(bool on) 
+    {
+      digitalWrite(_pin, on ? HIGH : LOW);
+      _on = on;
+    }
 };
 
 // We create some LEDs:
 #define LEDCOUNT 4
-LED myLEDs[LEDCOUNT] = {
+LED myLEDs[LEDCOUNT] = 
+{
   LED("Red LED",    33),
   LED("Yellow LED", 25),
   LED("Green LED",  26),
   LED("Blue LED",   27)
 };
 
-void setup() {
-  // For logging
-  Serial.begin(115200);
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // We create a node for the main page of the server, available via get
-  ResourceNode * nodeRoot     = new ResourceNode("/", "GET", &handleRoot);
-
-  // This node will turn an LED on or of. It has two parameters:
-  // 1) The ID of the LED (0..LEDCOUNT)
-  // 2) The new state (0..1)
-  // For more information on path parameters in general, see the Parameters example.
-  ResourceNode * nodeSwitch = new ResourceNode("/led/*/*", "POST", &handleSwitch);
-
-  // We want to use parameter validation. The ResourceNode class provides the method
-  // addPathParamValidator() for that. This method takes two parameters:
-  // 1) The index of the parameter that you want to validate, so for the first wildcard
-  //    in the route pattern that has been specified above, it's 0, and for the second
-  //    parameter it's 1.
-  // 2) A function pointer that takes an std::string as parameter and returns a bool.
-  //    That bool should be true if the parameter is considered valid.
-  // All those functions are called in the order in that they have been added. So if
-  // you want check if a parameter is an integer and then do some calculation with it,
-  // make sure to add the integer-check first and the other function later.
-  //
-  // If any of the functions returns false, the URL is considered to be invalid completely.
-  // In this case, the server will return with a static 400 Bad Request response.
-  // 
-  // For convenience, the ValidatorFunctions.hpp include file already provides some useful
-  // and common checks (integer, non-empty, ...). Have a look at it before you start
-  // implementing your own checks to save time!
-
-  // First we will take care of the LED ID. This ID should be...
-  // ... an unsigned integer ...
-  nodeSwitch->addPathParamValidator(0, &validateUnsignedInteger);
-  // ... and within the range of known IDs.
-  // We can treat the parameter safely as integer in this validator, as all validators
-  // are executed in order and validateUnsignedInteger has been run before.
-  nodeSwitch->addPathParamValidator(0, &validateLEDID);
-
-  // The second parameter should either be 0 or 1. We use our custom validateLEDState() validator for this:
-  nodeSwitch->addPathParamValidator(1, &validateLEDState);
-
-  // Not found node
-  ResourceNode * node404 = new ResourceNode("", "GET", &handle404);
-
-  // Add the root node to the server
-  secureServer.registerNode(nodeRoot);
-  // And the switch node
-  secureServer.registerNode(nodeSwitch);
-
-  // Add the 404 not found node to the server.
-  // The path is ignored for the default node.
-  secureServer.setDefaultNode(node404);
-
-  Serial.println("Starting server...");
-  secureServer.start();
-  if (secureServer.isRunning()) {
-    Serial.println("Server ready.");
-  }
-}
-
-void loop() {
-  // This call will let the server do its work
-  secureServer.loop();
-
-  // Other code would go here...
-  delay(1);
-}
-
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+// Root node, will show the LEDs that are available
+void handleRoot(HTTPRequest * req, HTTPResponse * res) 
+{
   // We will deliver an HTML page
   res->setHeader("Content-Type", "text/html");
 
@@ -187,8 +102,10 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body>");
 
   // Iterate over the LEDs.
-  for(int id = 0; id < LEDCOUNT; id++) {
+  for (int id = 0; id < LEDCOUNT; id++) 
+  {
     LED * led = &myLEDs[id];
+    
     res->print(
       "<form "
       "style=\"border:1px solid black;padding:10px;width:300px;margin:10px;float:left\" "
@@ -199,6 +116,7 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
       "\" "
       "action=\"/led/"
     );
+    
     res->print(id);
     res->print("/");
     res->print(led->_on ? 0 : 1);
@@ -221,9 +139,11 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
   );
 }
 
+// Node to switch an LED on or off
 // This is the handler for our post callback. We can work with the parameters without further
 // validation, as the server assures this function only gets called if the validation succeeded.
-void handleSwitch(HTTPRequest * req, HTTPResponse * res) {
+void handleSwitch(HTTPRequest * req, HTTPResponse * res) 
+{
   // POST, so drain the input, if any
   req->discardRequestBody();
 
@@ -237,31 +157,37 @@ void handleSwitch(HTTPRequest * req, HTTPResponse * res) {
 
   // Set the state of the LED. The value of the parameter can only be "0" or "1" here,
   // otherwise the server would not have called the handler.
-  led->setOn(params->getPathParameter(1)!="0");
+  led->setOn(params->getPathParameter(1) != "0");
 
   // Redirect the user to the main page
   res->setStatusCode(303);
   // This should make the browser do a GET /
-  res->setStatusText("See Other"); 
+  res->setStatusText("See Other");
   res->setHeader("Location", "/");
   res->println("Redirecting...");
 }
 
+// Validation function for the LED ID and state
 // This function is the validator for the second parameter of the POST /led route.
 // It accepts only the strings "0" (off) and "1" (on)
-bool validateLEDState(std::string s) {
+bool validateLEDState(std::string s) 
+{
   return s == "0" || s == "1";
 }
 
 // This function is a validator for the first parameter of the POST /led route.
 // We did check before that the parameter is an integer, now we check its range.
-bool validateLEDID(std::string s) {
+bool validateLEDID(std::string s) 
+{
   uint32_t id = std::stoul(s);
+  
   return id < LEDCOUNT;
 }
 
+// Default handler for resources that do not exist
 // For details to this function, see the Static-Page example
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res) 
+{
   req->discardRequestBody();
   res->setStatusCode(404);
   res->setStatusText("Not Found");
@@ -272,3 +198,94 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
   res->println("</html>");
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting Parameter_Validation on "); Serial.println(ARDUINO_BOARD);
+  
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // We create a node for the main page of the server, available via get
+  ResourceNode * nodeRoot     = new ResourceNode("/", "GET", &handleRoot);
+
+  // This node will turn an LED on or of. It has two parameters:
+  // 1) The ID of the LED (0..LEDCOUNT)
+  // 2) The new state (0..1)
+  // For more information on path parameters in general, see the Parameters example.
+  ResourceNode * nodeSwitch = new ResourceNode("/led/*/*", "POST", &handleSwitch);
+
+  // We want to use parameter validation. The ResourceNode class provides the method
+  // addPathParamValidator() for that. This method takes two parameters:
+  // 1) The index of the parameter that you want to validate, so for the first wildcard
+  //    in the route pattern that has been specified above, it's 0, and for the second
+  //    parameter it's 1.
+  // 2) A function pointer that takes an std::string as parameter and returns a bool.
+  //    That bool should be true if the parameter is considered valid.
+  // All those functions are called in the order in that they have been added. So if
+  // you want check if a parameter is an integer and then do some calculation with it,
+  // make sure to add the integer-check first and the other function later.
+  //
+  // If any of the functions returns false, the URL is considered to be invalid completely.
+  // In this case, the server will return with a static 400 Bad Request response.
+  //
+  // For convenience, the ValidatorFunctions.hpp include file already provides some useful
+  // and common checks (integer, non-empty, ...). Have a look at it before you start
+  // implementing your own checks to save time!
+
+  // First we will take care of the LED ID. This ID should be...
+  // ... an unsigned integer ...
+  nodeSwitch->addPathParamValidator(0, &validateUnsignedInteger);
+  // ... and within the range of known IDs.
+  // We can treat the parameter safely as integer in this validator, as all validators
+  // are executed in order and validateUnsignedInteger has been run before.
+  nodeSwitch->addPathParamValidator(0, &validateLEDID);
+
+  // The second parameter should either be 0 or 1. We use our custom validateLEDState() validator for this:
+  nodeSwitch->addPathParamValidator(1, &validateLEDState);
+
+  // Not found node
+  ResourceNode * node404 = new ResourceNode("", "GET", &handle404);
+
+  // Add the root node to the server
+  secureServer.registerNode(nodeRoot);
+  // And the switch node
+  secureServer.registerNode(nodeSwitch);
+
+  // Add the 404 not found node to the server.
+  // The path is ignored for the default node.
+  secureServer.setDefaultNode(node404);
+
+  Serial.println("Starting server...");
+  secureServer.start();
+  
+  if (secureServer.isRunning()) 
+  {
+    Serial.println("Server ready.");
+  }
+}
+
+void loop() 
+{
+  // This call will let the server do its work
+  secureServer.loop();
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/Parameter-Validation/cert.h b/examples/Parameter-Validation/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Parameter-Validation/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Parameter-Validation/private_key.h b/examples/Parameter-Validation/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Parameter-Validation/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Parameters/Parameters.ino b/examples/Parameters/Parameters.ino
index 9eeb63b..27ab2b1 100644
--- a/examples/Parameters/Parameters.ino
+++ b/examples/Parameters/Parameters.ino
@@ -1,28 +1,28 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, your need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show page on web server root that will display some SVG smileys.
- *    Using a simple HTML form and GET parameters, you can change the colors
- *    of those images.
- *  - Provide the svg image with an optional GET parameter that allows to
- *    modify the background color, URL: /images/awesome.svg
- *  - Provide an example that shows how wildcard URL parameters get parsed
- *    URL: /urlparam/some/thing
- *  - 404 for everything else
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, your need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show page on web server root that will display some SVG smileys.
+      Using a simple HTML form and GET parameters, you can change the colors
+      of those images.
+    - Provide the svg image with an optional GET parameter that allows to
+      modify the background color, URL: /images/awesome.svg
+    - Provide an example that shows how wildcard URL parameters get parsed
+      URL: /urlparam/some/thing
+    - 404 for everything else
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -42,88 +42,18 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 // The contstructor takes some more parameters, but we go for default values here.
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// We declare some handler functions (definition at the end of the file)
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handleSVG(HTTPRequest * req, HTTPResponse * res);
-void handleQueryDemo(HTTPRequest * req, HTTPResponse * res);
-void handlePathParam(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
+// Handler functions
 
-void setup() {
-  // For logging
-  Serial.begin(115200);
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // For every resource available on the server, we need to create a ResourceNode
-  // The ResourceNode links URL and HTTP method to a handler function
-  ResourceNode * nodeRoot      = new ResourceNode("/", "GET", &handleRoot);
-  ResourceNode * nodeSVG       = new ResourceNode("/images/awesome.svg", "GET", &handleSVG);
-  ResourceNode * nodeQueryDemo = new ResourceNode("/queryparams", "GET", &handleQueryDemo);
-  ResourceNode * node404       = new ResourceNode("", "GET", &handle404);
-
-  // Path parameters
-  // If you want (for example) to return a specific instance of an object type by its ID
-  // you can use URLs like /led/1, led/2, ... - And you do not need to register one Resource
-  // Node per ID, but you can use wildcards in the route definition. The following route
-  // has two wildcards, and will match for example to /urlparam/foo/bar, where "foo" and "bar"
-  // are accessible parameters in the handler function.
-  // Note: The wildcards can only be used between slashes at the moment (so /urlparam* would
-  // not work).
-  ResourceNode * nodeURLParam = new ResourceNode("/urlparam/*/*", "GET", &handlePathParam);
-
-  // Add the root node to the server
-  secureServer.registerNode(nodeRoot);
-
-  // Add the SVG image
-  secureServer.registerNode(nodeSVG);
-
-  // Query parameter demo
-  secureServer.registerNode(nodeQueryDemo);
-
-  // Add the path parameter
-  // Note: The order of nodes may become important here. If you have one node for "/led" (e.g. list of LEDs)
-  // and one node for /led/* (LED details), you should register the non-parameterized version first. The server
-  // follows a first-match policy. If you would register the details node first, a call to /led/ will be targetted
-  // at the details handler function with an empty parameter, which is probably not what you want.
-  secureServer.registerNode(nodeURLParam);
-
-  // Add the 404 not found node to the server.
-  // The path is ignored for the default node.
-  secureServer.setDefaultNode(node404);
-
-  Serial.println("Starting server...");
-  secureServer.start();
-  if (secureServer.isRunning()) {
-    Serial.println("Server ready.");
-  }
-}
-
-void loop() {
-	// This call will let the server do its work
-	secureServer.loop();
-
-	// Other code would go here...
-	delay(1);
-}
-
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+void handleRoot(HTTPRequest * req, HTTPResponse * res)
+{
   // We will deliver an HTML page
   res->setHeader("Content-Type", "text/html");
 
@@ -158,7 +88,8 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
   std::string paramName = "shades";
 
   // Print 6 faces
-  for(int i = 0; i < 6; i++) {
+  for (int i = 0; i < 6; i++)
+  {
     // Include the image of the handleSVG function with a specific color code
     res->print("<img style=\"height:100px;width:100px\" src=\"images/awesome.svg?color=");
 
@@ -166,17 +97,24 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
     // Default is dark gray.
     int r = 63, g = 63, b = 63;
     std::string paramVal;
-    if (params->getQueryParameter(paramName, paramVal)) {
-      if (paramVal == "red" || paramVal == "magenta" || paramVal == "yellow" || paramVal == "rainbow") {
+
+    if (params->getQueryParameter(paramName, paramVal))
+    {
+      if (paramVal == "red" || paramVal == "magenta" || paramVal == "yellow" || paramVal == "rainbow")
+      {
         r = 128 + random(0, 128);
       }
-      if (paramVal == "green" || paramVal == "cyan" || paramVal == "yellow" || paramVal == "rainbow") {
+
+      if (paramVal == "green" || paramVal == "cyan" || paramVal == "yellow" || paramVal == "rainbow")
+      {
         g = 128 + random(0, 128);
       }
-      if (paramVal == "blue" || paramVal == "magenta" || paramVal == "cyan" || paramVal == "rainbow") {
+
+      if (paramVal == "blue" || paramVal == "magenta" || paramVal == "cyan" || paramVal == "rainbow")
+      {
         b = 128 + random(0, 128);
       }
-		}
+    }
 
     // Print the random color. As the HTTPResponse extends the Print interface, we can make use of that.
     res->print(r, HEX);
@@ -185,6 +123,7 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
 
     res->print("\" alt=\"Awesome!\" />");
   }
+
   res->println("<p>You'll find another demo <a href=\"/queryparams?a=42&b&c=13&a=hello\">here</a>.</p>");
 
   // Link to the path parameter demo
@@ -201,7 +140,8 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
 //
 // If the color query parameter is set (so the URL is like awesome.svg?color=fede58), the
 // background of our awesome face is changed.
-void handleSVG(HTTPRequest * req, HTTPResponse * res) {
+void handleSVG(HTTPRequest * req, HTTPResponse * res)
+{
   // Get access to the parameters
   ResourceParameters * params = req->getParams();
 
@@ -218,22 +158,30 @@ void handleSVG(HTTPRequest * req, HTTPResponse * res) {
   // The getQueryParameter function will modify the second parameter, but only if the query
   // parameter is set.
   std::string requestColor;
-  if (params->getQueryParameter(colorParamName, requestColor)) {
+
+  if (params->getQueryParameter(colorParamName, requestColor))
+  {
     // Check for correct length
-    if (requestColor.length()==6) {
+    if (requestColor.length() == 6)
+    {
       bool colorOk = true;
+
       // Check that we only have characters within [0-9a-fA-F]
-      for(int i = 1; i < 6 && colorOk; i++) {
+      for (int i = 1; i < 6 && colorOk; i++)
+      {
         if (!(
-          (requestColor[i]>='0' && requestColor[i]<='9' ) ||
-          (requestColor[i]>='a' && requestColor[i]<='f' ) ||
-          (requestColor[i]>='A' && requestColor[i]<='F' )
-        )) {
+              (requestColor[i] >= '0' && requestColor[i] <= '9' ) ||
+              (requestColor[i] >= 'a' && requestColor[i] <= 'f' ) ||
+              (requestColor[i] >= 'A' && requestColor[i] <= 'F' )
+            ))
+        {
           colorOk = false;
         }
       }
+      
       // If validation was successful, replace the default color
-      if (colorOk) {
+      if (colorOk) 
+      {
         fillColor = requestColor;
       }
     }
@@ -260,7 +208,8 @@ void handleSVG(HTTPRequest * req, HTTPResponse * res) {
 // This is a more generic demo for the query parameters. It makes use of the iterator
 // interface to access them, which is useful if you do not know the paramter names in
 // adavance.
-void handleQueryDemo(HTTPRequest * req, HTTPResponse * res) {
+void handleQueryDemo(HTTPRequest * req, HTTPResponse * res) 
+{
   // A word of warning: In this example, we use the query parameters and directly print
   // them into the HTML output. We do this to simplify the demo. NEVER do this in a
   // real application, as it allows cross-site-scripting.
@@ -273,16 +222,18 @@ void handleQueryDemo(HTTPRequest * req, HTTPResponse * res) {
   res->println("</head>");
   res->println("<body>");
   res->println("<p>The following query paramters have been set:</p>");
-  
+
   // Start a table to display the parameters
   res->println("<table style=\"border:1px solid black collapse;\">");
   res->println("<tr><th>Key</th><th>Value</th></tr>");
-  // Iterate over the parameters. For more information, read about the C++ standard template library, 
+  // Iterate over the parameters. For more information, read about the C++ standard template library,
   // especially about vectors and iterators.
   ResourceParameters *params = req->getParams();
-  for(auto it = params->beginQueryParameters(); it != params->endQueryParameters(); ++it) {
+  
+  for (auto it = params->beginQueryParameters(); it != params->endQueryParameters(); ++it) 
+  {
     res->print("<tr><td>");
-    
+
     // The iterator yields std::pairs of std::strings. The first value contains the parameter key
     res->printStd((*it).first);
     res->print("</td><td>");
@@ -291,6 +242,7 @@ void handleQueryDemo(HTTPRequest * req, HTTPResponse * res) {
     res->printStd((*it).second);
     res->println("</td></tr>");
   }
+  
   res->println("</table>");
 
   // You can retrieve the total parameter count from the parameters instance:
@@ -308,7 +260,8 @@ void handleQueryDemo(HTTPRequest * req, HTTPResponse * res) {
 // This is a simple handler function that will show the content of URL parameters.
 // If you call for example /urlparam/foo/bar, you will get the parameter values
 // "foo" and "bar" provided by the ResourceParameters.
-void handlePathParam(HTTPRequest * req, HTTPResponse * res) {
+void handlePathParam(HTTPRequest * req, HTTPResponse * res) 
+{
   // Get access to the parameters
   ResourceParameters * params = req->getParams();
 
@@ -323,8 +276,10 @@ void handlePathParam(HTTPRequest * req, HTTPResponse * res) {
   // parameter as it is.
 
   std::string parameter1, parameter2;
+  
   // Print the first parameter value
-  if (params->getPathParameter(0, parameter1)) {
+  if (params->getPathParameter(0, parameter1)) 
+  {
     res->print("Parameter 1: ");
     res->printStd(parameter1);
   }
@@ -332,7 +287,8 @@ void handlePathParam(HTTPRequest * req, HTTPResponse * res) {
   res->println();
 
   // Print the second parameter value
-  if (params->getPathParameter(1, parameter2)) {
+  if (params->getPathParameter(1, parameter2)) 
+  {
     res->print("Parameter 2: ");
     res->printStd(parameter2);
   }
@@ -341,7 +297,8 @@ void handlePathParam(HTTPRequest * req, HTTPResponse * res) {
 }
 
 // For details to this function, see the Static-Page example
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res) 
+{
   req->discardRequestBody();
   res->setStatusCode(404);
   res->setStatusText("Not Found");
@@ -352,3 +309,81 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
   res->println("</html>");
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting Parameters on "); Serial.println(ARDUINO_BOARD);
+  
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // For every resource available on the server, we need to create a ResourceNode
+  // The ResourceNode links URL and HTTP method to a handler function
+  ResourceNode * nodeRoot      = new ResourceNode("/", "GET", &handleRoot);
+  ResourceNode * nodeSVG       = new ResourceNode("/images/awesome.svg", "GET", &handleSVG);
+  ResourceNode * nodeQueryDemo = new ResourceNode("/queryparams", "GET", &handleQueryDemo);
+  ResourceNode * node404       = new ResourceNode("", "GET", &handle404);
+
+  // Path parameters
+  // If you want (for example) to return a specific instance of an object type by its ID
+  // you can use URLs like /led/1, led/2, ... - And you do not need to register one Resource
+  // Node per ID, but you can use wildcards in the route definition. The following route
+  // has two wildcards, and will match for example to /urlparam/foo/bar, where "foo" and "bar"
+  // are accessible parameters in the handler function.
+  // Note: The wildcards can only be used between slashes at the moment (so /urlparam* would
+  // not work).
+  ResourceNode * nodeURLParam = new ResourceNode("/urlparam/*/*", "GET", &handlePathParam);
+
+  // Add the root node to the server
+  secureServer.registerNode(nodeRoot);
+
+  // Add the SVG image
+  secureServer.registerNode(nodeSVG);
+
+  // Query parameter demo
+  secureServer.registerNode(nodeQueryDemo);
+
+  // Add the path parameter
+  // Note: The order of nodes may become important here. If you have one node for "/led" (e.g. list of LEDs)
+  // and one node for /led/* (LED details), you should register the non-parameterized version first. The server
+  // follows a first-match policy. If you would register the details node first, a call to /led/ will be targetted
+  // at the details handler function with an empty parameter, which is probably not what you want.
+  secureServer.registerNode(nodeURLParam);
+
+  // Add the 404 not found node to the server.
+  // The path is ignored for the default node.
+  secureServer.setDefaultNode(node404);
+
+  Serial.println("Starting server...");
+  secureServer.start();
+  
+  if (secureServer.isRunning()) 
+  {
+    Serial.println("Server ready.");
+  }
+}
+
+void loop() 
+{
+  // This call will let the server do its work
+  secureServer.loop();
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/Parameters/cert.h b/examples/Parameters/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Parameters/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Parameters/private_key.h b/examples/Parameters/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Parameters/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Put-Post-Echo/Put-Post-Echo.ino b/examples/Put-Post-Echo/Put-Post-Echo.ino
index 16d792c..a7583de 100644
--- a/examples/Put-Post-Echo/Put-Post-Echo.ino
+++ b/examples/Put-Post-Echo/Put-Post-Echo.ino
@@ -1,23 +1,23 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, your need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show simple page on web server root
- *  - Provide an Echo-Service for PUT/POST requests on /
- *  - 404 for everything else
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, your need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show simple page on web server root
+    - Provide an Echo-Service for PUT/POST requests on /
+    - 404 for everything else
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -37,74 +37,21 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 // The contstructor takes some more parameters, but we go for default values here.
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// Declare some handler functions for the various URLs on the server
+// Handler functions for the various URLs on the server
 // The signature is always the same for those functions. They get two parameters,
 // which are pointers to the request data (read request body, headers, ...) and
 // to the response data (write response, set status code, ...)
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handleEcho(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
 
-void setup() {
-  // For logging
-  Serial.begin(115200);
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // For every resource available on the server, we need to create a ResourceNode
-  // The ResourceNode links URL and HTTP method to a handler function
-  ResourceNode * nodeRoot = new ResourceNode("/", "GET", &handleRoot);
-  ResourceNode * node404  = new ResourceNode("", "GET", &handle404);
-
-  // Register the echo handler. You can use the same handler function for multiple
-  // nodes. Note also that we now have three resource nodes for the / URL, so
-  // the server uses only the method to distinguish between them.
-  ResourceNode * nodeEchoPut  = new ResourceNode("/", "PUT", &handleEcho);
-  ResourceNode * nodeEchoPost = new ResourceNode("/", "POST", &handleEcho);
-
-  // Add the root node to the server
-  secureServer.registerNode(nodeRoot);
-
-  // Add the nodes for the echo service
-  secureServer.registerNode(nodeEchoPut);
-  secureServer.registerNode(nodeEchoPost);
-
-  // Add the 404 not found node to the server.
-  // The path is ignored for the default node.
-  secureServer.setDefaultNode(node404);
-
-  Serial.println("Starting server...");
-  secureServer.start();
-  if (secureServer.isRunning()) {
-    Serial.println("Server ready.");
-  }
-}
-
-void loop() {
-  // This call will let the server do its work
-  secureServer.loop();
-
-  // Other code would go here...
-  delay(1);
-}
-
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+void handleRoot(HTTPRequest * req, HTTPResponse * res)
+{
   // Status code is 200 OK by default.
   // We want to deliver a simple HTML page, so we send a corresponding content type:
   res->setHeader("Content-Type", "text/html");
@@ -118,33 +65,36 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
   res->println("<h1>Hello World!</h1>");
   res->print("<p>Your server is running for ");
   // A bit of dynamic data: Show the uptime
-  res->print((int)(millis()/1000), DEC);
+  res->print((int)(millis() / 1000), DEC);
   res->println(" seconds.</p>");
   res->print("<p>The easiest way to test the echo function is to use an HTTP debugging "
-      " tool where you are able to set a body and then let it call PUT or POST on"
-      " https://");
+             " tool where you are able to set a body and then let it call PUT or POST on"
+             " https://");
   res->print(WiFi.localIP());
   res->print("/. Otherwise you can use command line tools like curl:</p>"
-      "<pre>cat &lt;&lt;EOF | curl --insecure -X PUT -d @- https://");
+             "<pre>cat &lt;&lt;EOF | curl --insecure -X PUT -d @- https://");
   res->print(WiFi.localIP());
   res->print("/\nHere goes your request \nbody\n"
-      "EOF</pre>");
+             "EOF</pre>");
   res->println("</body>");
   res->println("</html>");
 }
 
-void handleEcho(HTTPRequest * req, HTTPResponse * res) {
+void handleEcho(HTTPRequest * req, HTTPResponse * res) 
+{
   // The echo callback will return the request body as response body.
 
   // We use text/plain for the response
-  res->setHeader("Content-Type","text/plain");
+  res->setHeader("Content-Type", "text/plain");
 
   // Stream the incoming request body to the response body
   // Theoretically, this should work for every request size.
   byte buffer[256];
-  // HTTPReqeust::requestComplete can be used to check whether the
+  
+  // HTTPRequest::requestComplete can be used to check whether the
   // body has been parsed completely.
-  while(!(req->requestComplete())) {
+  while (!(req->requestComplete())) 
+  {
     // HTTPRequest::readBytes provides access to the request body.
     // It requires a buffer, the max buffer length and it will return
     // the amount of bytes that have been written to the buffer.
@@ -157,7 +107,8 @@ void handleEcho(HTTPRequest * req, HTTPResponse * res) {
   }
 }
 
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res) 
+{
   // Discard request body, if we received any
   // We do this, as this is the default node and may also server POST/PUT requests
   req->discardRequestBody();
@@ -176,3 +127,66 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
   res->println("</html>");
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting Put_Post_Echo on "); Serial.println(ARDUINO_BOARD);
+  
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // For every resource available on the server, we need to create a ResourceNode
+  // The ResourceNode links URL and HTTP method to a handler function
+  ResourceNode * nodeRoot = new ResourceNode("/", "GET", &handleRoot);
+  ResourceNode * node404  = new ResourceNode("", "GET", &handle404);
+
+  // Register the echo handler. You can use the same handler function for multiple
+  // nodes. Note also that we now have three resource nodes for the / URL, so
+  // the server uses only the method to distinguish between them.
+  ResourceNode * nodeEchoPut  = new ResourceNode("/", "PUT", &handleEcho);
+  ResourceNode * nodeEchoPost = new ResourceNode("/", "POST", &handleEcho);
+
+  // Add the root node to the server
+  secureServer.registerNode(nodeRoot);
+
+  // Add the nodes for the echo service
+  secureServer.registerNode(nodeEchoPut);
+  secureServer.registerNode(nodeEchoPost);
+
+  // Add the 404 not found node to the server.
+  // The path is ignored for the default node.
+  secureServer.setDefaultNode(node404);
+
+  Serial.println("Starting server...");
+  secureServer.start();
+  
+  if (secureServer.isRunning()) 
+  {
+    Serial.println("Server ready.");
+  }
+}
+
+void loop() 
+{
+  // This call will let the server do its work
+  secureServer.loop();
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/Put-Post-Echo/cert.h b/examples/Put-Post-Echo/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Put-Post-Echo/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Put-Post-Echo/private_key.h b/examples/Put-Post-Echo/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Put-Post-Echo/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/REST-API/REST-API.ino b/examples/REST-API/REST-API.ino
index 7409398..efe1fe7 100644
--- a/examples/REST-API/REST-API.ino
+++ b/examples/REST-API/REST-API.ino
@@ -1,47 +1,47 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * This example is a bit more complex than the other ones, so be careful to 
- * follow all steps.
- * 
- * Make sure to check out the more basic examples like Static-Page to understand
- * the fundamental principles of the API before proceeding with this sketch.
- * 
- * To run this script, you need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Install the SPIFFS File uploader into your Arduino IDE to be able to
- *     upload static data to the webserver.
- *     Follow the instructions at:
- *     https://github.com/me-no-dev/arduino-esp32fs-plugin
- *  3) Upload the static files from the data/ directory of the example to your
- *     module's SPIFFs by using "ESP32 Sketch Data Upload" from the tools menu.
- *     If you face any problems, read the description of the libraray mentioned
- *     above.
- *     Note: If mounting SPIFFS fails, the script will wait for a serial connection
- *     (open your serial monitor!) and ask if it should format the SPIFFS partition.
- *     You may need this before uploading the data
- *     Note: Make sure to select a partition layout that allows for SPIFFS in the
- *     boards menu
- *  4) Have the ArduinoJSON library installed and available. (Tested with Version 5.13.4)
- *     You'll find it at:
- *     https://arduinojson.org/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Serve static files from the SPIFFS's data/public directory
- *  - Provide a REST API at /api to receive the asynchronous http requests
- *    - /api/uptime provides access to the current system uptime
- *    - /api/events allows to register or delete events to turn PINs on/off
- *      at certain times.
- *  - Use Arduino JSON for body parsing and generation of responses.
- *  - The certificate is generated on first run and stored to the SPIFFS in
- *    the cert directory (so that the client cannot retrieve the private key)
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   This example is a bit more complex than the other ones, so be careful to
+   follow all steps.
+
+   Make sure to check out the more basic examples like Static-Page to understand
+   the fundamental principles of the API before proceeding with this sketch.
+
+   To run this script, you need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Install the SPIFFS File uploader into your Arduino IDE to be able to
+       upload static data to the webserver.
+       Follow the instructions at:
+       https://github.com/me-no-dev/arduino-esp32fs-plugin
+    3) Upload the static files from the data/ directory of the example to your
+       module's SPIFFs by using "ESP32 Sketch Data Upload" from the tools menu.
+       If you face any problems, read the description of the libraray mentioned
+       above.
+       Note: If mounting SPIFFS fails, the script will wait for a serial connection
+       (open your serial monitor!) and ask if it should format the SPIFFS partition.
+       You may need this before uploading the data
+       Note: Make sure to select a partition layout that allows for SPIFFS in the
+       boards menu
+    4) Have the ArduinoJSON library installed and available. (Tested with Version 5.13.4)
+       You'll find it at:
+       https://arduinojson.org/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Serve static files from the SPIFFS's data/public directory
+    - Provide a REST API at /api to receive the asynchronous http requests
+      - /api/uptime provides access to the current system uptime
+      - /api/events allows to register or delete events to turn PINs on/off
+        at certain times.
+    - Use Arduino JSON for body parsing and generation of responses.
+    - The certificate is generated on first run and stored to the SPIFFS in
+      the cert directory (so that the client cannot retrieve the private key)
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // We will use wifi
 #include <WiFi.h>
@@ -61,7 +61,8 @@
 
 // We need to specify some content-type mapping, so the resources get delivered with the
 // right content type and are displayed correctly in the browser
-char contentTypes[][2][32] = {
+char contentTypes[][2][32] =
+{
   {".html", "text/html"},
   {".css",  "text/css"},
   {".js",   "application/javascript"},
@@ -82,15 +83,11 @@ char contentTypes[][2][32] = {
 using namespace httpsserver;
 
 SSLCert * getCertificate();
-void handleSPIFFS(HTTPRequest * req, HTTPResponse * res);
-void handleGetUptime(HTTPRequest * req, HTTPResponse * res);
-void handleGetEvents(HTTPRequest * req, HTTPResponse * res);
-void handlePostEvent(HTTPRequest * req, HTTPResponse * res);
-void handleDeleteEvent(HTTPRequest * req, HTTPResponse * res);
 
 // We use the following struct to store GPIO events:
 #define MAX_EVENTS 20
-struct {
+struct
+{
   // is this event used (events that have been run will be set to false)
   bool active;
   // when should it be run?
@@ -105,170 +102,84 @@ struct {
 // we have initialized the SPIFFS and read or created the certificate
 HTTPSServer * secureServer;
 
-void setup() {
-  // For logging
-  Serial.begin(115200);
-
-  // Set the pins that we will use as output pins
-  pinMode(25, OUTPUT);
-  pinMode(26, OUTPUT);
-  pinMode(27, OUTPUT);
-  pinMode(32, OUTPUT);
-  pinMode(33, OUTPUT);
-
-  // Try to mount SPIFFS without formatting on failure
-  if (!SPIFFS.begin(false)) {
-    // If SPIFFS does not work, we wait for serial connection...
-    while(!Serial);
-    delay(1000);
-
-    // Ask to format SPIFFS using serial interface
-    Serial.print("Mounting SPIFFS failed. Try formatting? (y/n): ");
-    while(!Serial.available());
-    Serial.println();
-
-    // If the user did not accept to try formatting SPIFFS or formatting failed:
-    if (Serial.read() != 'y' || !SPIFFS.begin(true)) {
-      Serial.println("SPIFFS not available. Stop.");
-      while(true);
-    }
-    Serial.println("SPIFFS has been formated.");
-  }
-  Serial.println("SPIFFS has been mounted.");
-
-  // Now that SPIFFS is ready, we can create or load the certificate
-  SSLCert *cert = getCertificate();
-  if (cert == NULL) {
-    Serial.println("Could not load certificate. Stop.");
-    while(true);
-  }
-
-  // Initialize event structure:
-  for(int i = 0; i < MAX_EVENTS; i++) {
-    events[i].active = false;
-    events[i].gpio = 0;
-    events[i].state = LOW;
-    events[i].time = 0;
-  }
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // Create the server with the certificate we loaded before
-  secureServer = new HTTPSServer(cert);
-
-  // We register the SPIFFS handler as the default node, so every request that does
-  // not hit any other node will be redirected to the file system.
-  ResourceNode * spiffsNode = new ResourceNode("", "", &handleSPIFFS);
-  secureServer->setDefaultNode(spiffsNode);
-
-  // Add a handler that serves the current system uptime at GET /api/uptime
-  ResourceNode * uptimeNode = new ResourceNode("/api/uptime", "GET", &handleGetUptime);
-  secureServer->registerNode(uptimeNode);
-
-  // Add the handler nodes that deal with modifying the events:
-  ResourceNode * getEventsNode = new ResourceNode("/api/events", "GET", &handleGetEvents);
-  secureServer->registerNode(getEventsNode);
-  ResourceNode * postEventNode = new ResourceNode("/api/events", "POST", &handlePostEvent);
-  secureServer->registerNode(postEventNode);
-  ResourceNode * deleteEventNode = new ResourceNode("/api/events/*", "DELETE", &handleDeleteEvent);
-  secureServer->registerNode(deleteEventNode);
-
-  Serial.println("Starting server...");
-  secureServer->start();
-  if (secureServer->isRunning()) {
-    Serial.println("Server ready.");
-  }
-}
-
-void loop() {
-  // This call will let the server do its work
-  secureServer->loop();
-
-  // Here we handle the events
-  unsigned long now = millis() / 1000;
-  for (int i = 0; i < MAX_EVENTS; i++) {
-    // Only handle active events:
-    if (events[i].active) {
-      // Only if the counter has recently been exceeded
-      if (events[i].time < now) {
-      // Apply the state change
-      digitalWrite(events[i].gpio, events[i].state);
-
-      // Deactivate the event so it doesn't fire again
-      events[i].active = false;
-      }
-    }
-  }
-
-  // Other code would go here...
-  delay(1);
-}
 
 /**
- * This function will either read the certificate and private key from SPIFFS or
- * create a self-signed certificate and write it to SPIFFS for next boot
- */
-SSLCert * getCertificate() {
+   This function will either read the certificate and private key from SPIFFS or
+   create a self-signed certificate and write it to SPIFFS for next boot
+*/
+SSLCert * getCertificate()
+{
   // Try to open key and cert file to see if they exist
   File keyFile = SPIFFS.open("/key.der");
   File certFile = SPIFFS.open("/cert.der");
 
-  // If now, create them 
-  if (!keyFile || !certFile || keyFile.size()==0 || certFile.size()==0) {
+  // If now, create them
+  if (!keyFile || !certFile || keyFile.size() == 0 || certFile.size() == 0)
+  {
     Serial.println("No certificate found in SPIFFS, generating a new one for you.");
     Serial.println("If you face a Guru Meditation, give the script another try (or two...).");
     Serial.println("This may take up to a minute, so please stand by :)");
 
     SSLCert * newCert = new SSLCert();
+
     // The part after the CN= is the domain that this certificate will match, in this
     // case, it's esp32.local.
     // However, as the certificate is self-signed, your browser won't trust the server
     // anyway.
     int res = createSelfSignedCert(*newCert, KEYSIZE_1024, "CN=esp32.local,O=acme,C=DE");
-    if (res == 0) {
+
+    if (res == 0)
+    {
       // We now have a certificate. We store it on the SPIFFS to restore it on next boot.
 
       bool failure = false;
+
       // Private key
       keyFile = SPIFFS.open("/key.der", FILE_WRITE);
-      if (!keyFile || !keyFile.write(newCert->getPKData(), newCert->getPKLength())) {
+
+      if (!keyFile || !keyFile.write(newCert->getPKData(), newCert->getPKLength()))
+      {
         Serial.println("Could not write /key.der");
         failure = true;
       }
-      if (keyFile) keyFile.close();
+
+      if (keyFile) 
+        keyFile.close();
 
       // Certificate
       certFile = SPIFFS.open("/cert.der", FILE_WRITE);
-      if (!certFile || !certFile.write(newCert->getCertData(), newCert->getCertLength())) {
+
+      if (!certFile || !certFile.write(newCert->getCertData(), newCert->getCertLength()))
+      {
         Serial.println("Could not write /cert.der");
         failure = true;
       }
-      if (certFile) certFile.close();
 
-      if (failure) {
+      if (certFile)
+        certFile.close();
+
+      if (failure)
+      {
         Serial.println("Certificate could not be stored permanently, generating new certificate on reboot...");
       }
 
       return newCert;
 
-    } else {
+    }
+    else
+    {
       // Certificate generation failed. Inform the user.
       Serial.println("An error occured during certificate generation.");
       Serial.print("Error code is 0x");
       Serial.println(res, HEX);
       Serial.println("You may have a look at SSLCert.h to find the reason for this error.");
+
       return NULL;
     }
 
-	} else {
+  }
+  else
+  {
     Serial.println("Reading certificate from SPIFFS.");
 
     // The files exist, so we can create a certificate based on them
@@ -276,16 +187,23 @@ SSLCert * getCertificate() {
     size_t certSize = certFile.size();
 
     uint8_t * keyBuffer = new uint8_t[keySize];
-    if (keyBuffer == NULL) {
+
+    if (keyBuffer == NULL)
+    {
       Serial.println("Not enough memory to load privat key");
       return NULL;
     }
+
     uint8_t * certBuffer = new uint8_t[certSize];
-    if (certBuffer == NULL) {
+
+    if (certBuffer == NULL)
+    {
       delete[] keyBuffer;
       Serial.println("Not enough memory to load certificate");
+
       return NULL;
     }
+
     keyFile.read(keyBuffer, keySize);
     certFile.read(certBuffer, certSize);
 
@@ -298,26 +216,30 @@ SSLCert * getCertificate() {
 }
 
 /**
- * This handler function will try to load the requested resource from SPIFFS's /public folder.
- * 
- * If the method is not GET, it will throw 405, if the file is not found, it will throw 404.
- */
-void handleSPIFFS(HTTPRequest * req, HTTPResponse * res) {
-	
+   This handler function will try to load the requested resource from SPIFFS's /public folder.
+
+   If the method is not GET, it will throw 405, if the file is not found, it will throw 404.
+*/
+void handleSPIFFS(HTTPRequest * req, HTTPResponse * res)
+{
+
   // We only handle GET here
-  if (req->getMethod() == "GET") {
+  if (req->getMethod() == "GET")
+  {
     // Redirect / to /index.html
-    std::string reqFile = req->getRequestString()=="/" ? "/index.html" : req->getRequestString();
+    std::string reqFile = req->getRequestString() == "/" ? "/index.html" : req->getRequestString();
 
     // Try to open the file
     std::string filename = std::string(DIR_PUBLIC) + reqFile;
 
     // Check if the file exists
-    if (!SPIFFS.exists(filename.c_str())) {
+    if (!SPIFFS.exists(filename.c_str()))
+    {
       // Send "404 Not Found" as response, as the file doesn't seem to exist
       res->setStatusCode(404);
       res->setStatusText("Not found");
       res->println("404 Not Found");
+
       return;
     }
 
@@ -328,24 +250,32 @@ void handleSPIFFS(HTTPRequest * req, HTTPResponse * res) {
 
     // Content-Type is guessed using the definition of the contentTypes-table defined above
     int cTypeIdx = 0;
-    do {
-      if(reqFile.rfind(contentTypes[cTypeIdx][0])!=std::string::npos) {
+
+    do
+    {
+      if (reqFile.rfind(contentTypes[cTypeIdx][0]) != std::string::npos)
+      {
         res->setHeader("Content-Type", contentTypes[cTypeIdx][1]);
         break;
       }
-      cTypeIdx+=1;
-    } while(strlen(contentTypes[cTypeIdx][0])>0);
+
+      cTypeIdx += 1;
+    } while (strlen(contentTypes[cTypeIdx][0]) > 0);
 
     // Read the file and write it to the response
     uint8_t buffer[256];
     size_t length = 0;
-    do {
+
+    do
+    {
       length = file.read(buffer, 256);
       res->write(buffer, length);
     } while (length > 0);
 
     file.close();
-  } else {
+  }
+  else
+  {
     // If there's any body, discard it
     req->discardRequestBody();
     // Send "405 Method not allowed" as response
@@ -356,16 +286,18 @@ void handleSPIFFS(HTTPRequest * req, HTTPResponse * res) {
 }
 
 /**
- * This function will return the uptime in seconds as JSON object:
- * {"uptime": 42}
- */
-void handleGetUptime(HTTPRequest * req, HTTPResponse * res) {
+   This function will return the uptime in seconds as JSON object:
+   {"uptime": 42}
+*/
+void handleGetUptime(HTTPRequest * req, HTTPResponse * res)
+{
   // Create a buffer of size 1 (pretty simple, we have just one key here)
   StaticJsonBuffer<JSON_OBJECT_SIZE(1)> jsonBuffer;
   // Create an object at the root
   JsonObject& obj = jsonBuffer.createObject();
+
   // Set the uptime key to the uptime in seconds
-  obj["uptime"] = millis()/1000;
+  obj["uptime"] = millis() / 1000;
   // Set the content type of the response
   res->setHeader("Content-Type", "application/json");
   // As HTTPResponse implements the Print interface, this works fine. Just remember
@@ -374,13 +306,17 @@ void handleGetUptime(HTTPRequest * req, HTTPResponse * res) {
 }
 
 /**
- * This handler will return a JSON array of currently active events for GET /api/events
- */
-void handleGetEvents(HTTPRequest * req, HTTPResponse * res) {
+   This handler will return a JSON array of currently active events for GET /api/events
+*/
+void handleGetEvents(HTTPRequest * req, HTTPResponse * res)
+{
   // We need to calculate the capacity of the json buffer
   int activeEvents = 0;
-  for(int i = 0; i < MAX_EVENTS; i++) {
-    if (events[i].active) activeEvents++;
+
+  for (int i = 0; i < MAX_EVENTS; i++)
+  {
+    if (events[i].active)
+      activeEvents++;
   }
 
   // For each active event, we need 1 array element with 4 objects
@@ -389,8 +325,11 @@ void handleGetEvents(HTTPRequest * req, HTTPResponse * res) {
   // DynamicJsonBuffer is created on the heap instead of the stack
   DynamicJsonBuffer jsonBuffer(capacity);
   JsonArray& arr = jsonBuffer.createArray();
-  for(int i = 0; i < MAX_EVENTS; i++) {
-    if (events[i].active) {
+
+  for (int i = 0; i < MAX_EVENTS; i++)
+  {
+    if (events[i].active)
+    {
       JsonObject& eventObj = arr.createNestedObject();
       eventObj["gpio"] = events[i].gpio;
       eventObj["state"] = events[i].state;
@@ -405,29 +344,35 @@ void handleGetEvents(HTTPRequest * req, HTTPResponse * res) {
   arr.printTo(*res);
 }
 
-void handlePostEvent(HTTPRequest * req, HTTPResponse * res) {
+void handlePostEvent(HTTPRequest * req, HTTPResponse * res)
+{
   // We expect an object with 4 elements and add some buffer
   const size_t capacity = JSON_OBJECT_SIZE(4) + 180;
   DynamicJsonBuffer jsonBuffer(capacity);
 
   // Create buffer to read request
   char * buffer = new char[capacity + 1];
-  memset(buffer, 0, capacity+1);
+  memset(buffer, 0, capacity + 1);
 
   // Try to read request into buffer
   size_t idx = 0;
+
   // while "not everything read" or "buffer is full"
-  while (!req->requestComplete() && idx < capacity) {
-    idx += req->readChars(buffer + idx, capacity-idx);
+  while (!req->requestComplete() && idx < capacity)
+  {
+    idx += req->readChars(buffer + idx, capacity - idx);
   }
 
   // If the request is still not read completely, we cannot process it.
-  if (!req->requestComplete()) {
+  if (!req->requestComplete())
+  {
     res->setStatusCode(413);
     res->setStatusText("Request entity too large");
     res->println("413 Request entity too large");
+
     // Clean up
     delete[] buffer;
+
     return;
   }
 
@@ -436,40 +381,55 @@ void handlePostEvent(HTTPRequest * req, HTTPResponse * res) {
 
   // Check input data types
   bool dataValid = true;
-  if (!reqObj.is<long>("time") || !reqObj.is<int>("gpio") || !reqObj.is<int>("state")) {
+
+  if (!reqObj.is<long>("time") || !reqObj.is<int>("gpio") || !reqObj.is<int>("state"))
+  {
     dataValid = false;
   }
-	
+
   // Check actual values
   unsigned long eTime = 0;
   int eGpio = 0;
   int eState = LOW;
-  if (dataValid) {
+
+  if (dataValid)
+  {
     eTime = reqObj["time"];
-    if (eTime < millis()/1000) dataValid = false;
+
+    if (eTime < millis() / 1000)
+      dataValid = false;
 
     eGpio = reqObj["gpio"];
-    if (!(eGpio == 25 || eGpio == 26 || eGpio == 27 || eGpio == 32 || eGpio == 33)) dataValid = false;
+
+    if (!(eGpio == 25 || eGpio == 26 || eGpio == 27 || eGpio == 32 || eGpio == 33))
+      dataValid = false;
 
     eState = reqObj["state"];
-    if (eState != HIGH && eState != LOW) dataValid = false;
+
+    if (eState != HIGH && eState != LOW)
+      dataValid = false;
   }
 
   // Clean up, we don't need the buffer any longer
   delete[] buffer;
 
   // If something failed: 400
-  if (!dataValid) {
+  if (!dataValid) 
+  {
     res->setStatusCode(400);
     res->setStatusText("Bad Request");
     res->println("400 Bad Request");
+    
     return;
   }
 
   // Try to find an inactive event in the list to write the data to
   int eventID = -1;
-  for(int i = 0; i < MAX_EVENTS && eventID==-1; i++) {
-    if (!events[i].active) {
+  
+  for (int i = 0; i < MAX_EVENTS && eventID == -1; i++)
+  {
+    if (!events[i].active) 
+    {
       eventID = i;
       events[i].gpio = eGpio;
       events[i].time = eTime;
@@ -479,7 +439,8 @@ void handlePostEvent(HTTPRequest * req, HTTPResponse * res) {
   }
 
   // Check if we could store the event
-  if (eventID>-1) {
+  if (eventID > -1) 
+  {
     // Create a buffer for the response
     StaticJsonBuffer<JSON_OBJECT_SIZE(4)> resBuffer;
 
@@ -496,33 +457,168 @@ void handlePostEvent(HTTPRequest * req, HTTPResponse * res) {
     res->setHeader("Content-Type", "application/json");
     resObj.printTo(*res);
 
-  } else {
+  } 
+  else 
+  {
     // We could not store the event, no free slot.
     res->setStatusCode(507);
     res->setStatusText("Insufficient storage");
     res->println("507 Insufficient storage");
-
   }
 }
 
 /**
- * This handler will delete an event (meaning: deactive the event)
- */
-void handleDeleteEvent(HTTPRequest * req, HTTPResponse * res) {
+   This handler will delete an event (meaning: deactive the event)
+*/
+void handleDeleteEvent(HTTPRequest * req, HTTPResponse * res) 
+{
   // Access the parameter from the URL. See Parameters example for more details on this
   ResourceParameters * params = req->getParams();
   size_t eid = std::atoi(params->getPathParameter(0).c_str());
 
-  if (eid < MAX_EVENTS) {
+  if (eid < MAX_EVENTS) 
+  {
     // Set the inactive flag
     events[eid].active = false;
     // And return a successful response without body
     res->setStatusCode(204);
     res->setStatusText("No Content");
-  } else {
+  } 
+  else 
+  {
     // Send error message
     res->setStatusCode(400);
     res->setStatusText("Bad Request");
     res->println("400 Bad Request");
   }
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting REST_API on "); Serial.println(ARDUINO_BOARD);
+
+  // Set the pins that we will use as output pins
+  pinMode(25, OUTPUT);
+  pinMode(26, OUTPUT);
+  pinMode(27, OUTPUT);
+  pinMode(32, OUTPUT);
+  pinMode(33, OUTPUT);
+
+  // Try to mount SPIFFS without formatting on failure
+  if (!SPIFFS.begin(false))
+  {
+    // If SPIFFS does not work, we wait for serial connection...
+    while (!Serial);
+    delay(1000);
+
+    // Ask to format SPIFFS using serial interface
+    Serial.print("Mounting SPIFFS failed. Try formatting? (y/n): ");
+    while (!Serial.available());
+    Serial.println();
+
+    // If the user did not accept to try formatting SPIFFS or formatting failed:
+    if (Serial.read() != 'y' || !SPIFFS.begin(true)) 
+    {
+      Serial.println("SPIFFS not available. Stop.");
+      while (true);
+    }
+    
+    Serial.println("SPIFFS has been formated.");
+  }
+  
+  Serial.println("SPIFFS has been mounted.");
+
+  // Now that SPIFFS is ready, we can create or load the certificate
+  SSLCert *cert = getCertificate();
+  
+  if (cert == NULL) 
+  {
+    Serial.println("Could not load certificate. Stop.");
+    while (true);
+  }
+
+  // Initialize event structure:
+  for (int i = 0; i < MAX_EVENTS; i++) 
+  {
+    events[i].active = false;
+    events[i].gpio = 0;
+    events[i].state = LOW;
+    events[i].time = 0;
+  }
+
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // Create the server with the certificate we loaded before
+  secureServer = new HTTPSServer(cert);
+
+  // We register the SPIFFS handler as the default node, so every request that does
+  // not hit any other node will be redirected to the file system.
+  ResourceNode * spiffsNode = new ResourceNode("", "", &handleSPIFFS);
+  secureServer->setDefaultNode(spiffsNode);
+
+  // Add a handler that serves the current system uptime at GET /api/uptime
+  ResourceNode * uptimeNode = new ResourceNode("/api/uptime", "GET", &handleGetUptime);
+  secureServer->registerNode(uptimeNode);
+
+  // Add the handler nodes that deal with modifying the events:
+  ResourceNode * getEventsNode = new ResourceNode("/api/events", "GET", &handleGetEvents);
+  secureServer->registerNode(getEventsNode);
+  ResourceNode * postEventNode = new ResourceNode("/api/events", "POST", &handlePostEvent);
+  secureServer->registerNode(postEventNode);
+  ResourceNode * deleteEventNode = new ResourceNode("/api/events/*", "DELETE", &handleDeleteEvent);
+  secureServer->registerNode(deleteEventNode);
+
+  Serial.println("Starting server...");
+  secureServer->start();
+  
+  if (secureServer->isRunning()) 
+  {
+    Serial.println("Server ready.");
+  }
+}
+
+void loop()
+{
+  // This call will let the server do its work
+  secureServer->loop();
+
+  // Here we handle the events
+  unsigned long now = millis() / 1000;
+
+  for (int i = 0; i < MAX_EVENTS; i++)
+  {
+    // Only handle active events:
+    if (events[i].active)
+    {
+      // Only if the counter has recently been exceeded
+      if (events[i].time < now)
+      {
+        // Apply the state change
+        digitalWrite(events[i].gpio, events[i].state);
+
+        // Deactivate the event so it doesn't fire again
+        events[i].active = false;
+      }
+    }
+  }
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/REST-API/cert.h b/examples/REST-API/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/REST-API/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/REST-API/private_key.h b/examples/REST-API/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/REST-API/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Self-Signed-Certificate/Self-Signed-Certificate.ino b/examples/Self-Signed-Certificate/Self-Signed-Certificate.ino
index 8643e78..141d926 100644
--- a/examples/Self-Signed-Certificate/Self-Signed-Certificate.ino
+++ b/examples/Self-Signed-Certificate/Self-Signed-Certificate.ino
@@ -1,23 +1,23 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, you need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show simple page on web server root
- *  - 404 for everything else
- * 
- * In contrast to the other examples, the certificate and the private key will be
- * generated on the ESP32, so you do not need to provide them here.
- * (this means no need to run create_cert.sh)
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, you need to
+    1) Enter your WiFi SSID and PSK below this comment
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show simple page on web server root
+    - 404 for everything else
+
+   In contrast to the other examples, the certificate and the private key will be
+   generated on the ESP32, so you do not need to provide them here.
+   (this means no need to run create_cert.sh)
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // We will use wifi
 #include <WiFi.h>
@@ -34,15 +34,58 @@ using namespace httpsserver;
 SSLCert * cert;
 HTTPSServer * secureServer;
 
-// Declare some handler functions for the various URLs on the server
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
+// Handler functions for the various URLs on the server
+
+void handleRoot(HTTPRequest * req, HTTPResponse * res)
+{
+  // Status code is 200 OK by default.
+  // We want to deliver a simple HTML page, so we send a corresponding content type:
+  res->setHeader("Content-Type", "text/html");
+
+  // The response implements the Print interface, so you can use it just like
+  // you would write to Serial etc.
+  res->println("<!DOCTYPE html>");
+  res->println("<html>");
+  res->println("<head><title>Hello World!</title></head>");
+  res->println("<body>");
+  res->println("<h1>Hello World!</h1>");
+  res->print("<p>Your server is running for ");
+  // A bit of dynamic data: Show the uptime
+  res->print((int)(millis() / 1000), DEC);
+  res->println(" seconds.</p>");
+  res->println("</body>");
+  res->println("</html>");
+}
+
+void handle404(HTTPRequest * req, HTTPResponse * res)
+{
+  // Discard request body, if we received any
+  // We do this, as this is the default node and may also server POST/PUT requests
+  req->discardRequestBody();
+
+  // Set the response status
+  res->setStatusCode(404);
+  res->setStatusText("Not Found");
+
+  // Set content type of the response
+  res->setHeader("Content-Type", "text/html");
+
+  // Write a tiny HTTP page
+  res->println("<!DOCTYPE html>");
+  res->println("<html>");
+  res->println("<head><title>Not Found</title></head>");
+  res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
+  res->println("</html>");
+}
 
-void setup() {
+void setup() 
+{
   // For logging
   Serial.begin(115200);
   delay(3000); // wait for the monitor to reconnect after uploading.
 
+  Serial.print("\nStarting Self_Signed_Certificate on "); Serial.println(ARDUINO_BOARD);
+
   Serial.println("Creating a new self-signed certificate.");
   Serial.println("This may take up to a minute, so be patient ;-)");
 
@@ -59,18 +102,22 @@ void setup() {
   // - Dates for certificate validity (optional, default is 2019-2029, both included)
   //   Format is YYYYMMDDhhmmss
   int createCertResult = createSelfSignedCert(
-    *cert,
-    KEYSIZE_2048,
-    "CN=myesp32.local,O=FancyCompany,C=DE",
-    "20190101000000",
-    "20300101000000"
-  );
+                           *cert,
+                           KEYSIZE_2048,
+                           "CN=myesp32.local,O=FancyCompany,C=DE",
+                           "20190101000000",
+                           "20300101000000"
+                         );
 
   // Now check if creating that worked
-  if (createCertResult != 0) {
+  if (createCertResult != 0) 
+  {
     Serial.printf("Cerating certificate failed. Error Code = 0x%02X, check SSLCert.hpp for details", createCertResult);
-    while(true) delay(500);
+    
+    while (true) 
+      delay(500);
   }
+  
   Serial.println("Creating the certificate was successful");
 
   // If you're working on a serious project, this would be a good place to initialize some form of non-volatile storage
@@ -99,10 +146,13 @@ void setup() {
   // Connect to WiFi
   Serial.println("Setting up WiFi");
   WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
     Serial.print(".");
     delay(500);
   }
+  
   Serial.print("Connected. IP=");
   Serial.println(WiFi.localIP());
 
@@ -118,55 +168,18 @@ void setup() {
 
   Serial.println("Starting server...");
   secureServer->start();
-  if (secureServer->isRunning()) {
+  
+  if (secureServer->isRunning()) 
+  {
     Serial.println("Server ready.");
   }
 }
 
-void loop() {
+void loop() 
+{
   // This call will let the server do its work
   secureServer->loop();
 
   // Other code would go here...
   delay(1);
 }
-
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
-  // Status code is 200 OK by default.
-  // We want to deliver a simple HTML page, so we send a corresponding content type:
-  res->setHeader("Content-Type", "text/html");
-
-  // The response implements the Print interface, so you can use it just like
-  // you would write to Serial etc.
-  res->println("<!DOCTYPE html>");
-  res->println("<html>");
-  res->println("<head><title>Hello World!</title></head>");
-  res->println("<body>");
-  res->println("<h1>Hello World!</h1>");
-  res->print("<p>Your server is running for ");
-  // A bit of dynamic data: Show the uptime
-  res->print((int)(millis()/1000), DEC);
-  res->println(" seconds.</p>");
-  res->println("</body>");
-  res->println("</html>");
-}
-
-void handle404(HTTPRequest * req, HTTPResponse * res) {
-  // Discard request body, if we received any
-  // We do this, as this is the default node and may also server POST/PUT requests
-  req->discardRequestBody();
-
-  // Set the response status
-  res->setStatusCode(404);
-  res->setStatusText("Not Found");
-
-  // Set content type of the response
-  res->setHeader("Content-Type", "text/html");
-
-  // Write a tiny HTTP page
-  res->println("<!DOCTYPE html>");
-  res->println("<html>");
-  res->println("<head><title>Not Found</title></head>");
-  res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
-  res->println("</html>");
-}
diff --git a/examples/Self-Signed-Certificate/cert.h b/examples/Self-Signed-Certificate/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Self-Signed-Certificate/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Self-Signed-Certificate/private_key.h b/examples/Self-Signed-Certificate/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Self-Signed-Certificate/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Static-Page/Static-Page.ino b/examples/Static-Page/Static-Page.ino
index 6bb7bbf..147b183 100644
--- a/examples/Static-Page/Static-Page.ino
+++ b/examples/Static-Page/Static-Page.ino
@@ -1,22 +1,22 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, your need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show simple page on web server root
- *  - 404 for everything else
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, your need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show simple page on web server root
+    - 404 for everything else
+*/
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Include certificate data (see note above)
 #include "cert.h"
@@ -39,68 +39,21 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 
 // Create an SSL-enabled server that uses the certificate
 // The contstructor takes some more parameters, but we go for default values here.
 HTTPSServer secureServer = HTTPSServer(&cert);
 
-// Declare some handler functions for the various URLs on the server
+// Handler functions for the various URLs on the server
 // The signature is always the same for those functions. They get two parameters,
 // which are pointers to the request data (read request body, headers, ...) and
 // to the response data (write response, set status code, ...)
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handleFavicon(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
-
-void setup() {
-  // For logging
-  Serial.begin(115200);
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // For every resource available on the server, we need to create a ResourceNode
-  // The ResourceNode links URL and HTTP method to a handler function
-  ResourceNode * nodeRoot    = new ResourceNode("/", "GET", &handleRoot);
-  ResourceNode * nodeFavicon = new ResourceNode("/favicon.ico", "GET", &handleFavicon);
-  ResourceNode * node404     = new ResourceNode("", "GET", &handle404);
-
-  // Add the root node to the server
-  secureServer.registerNode(nodeRoot);
-
-  // Add the favicon
-  secureServer.registerNode(nodeFavicon);
-
-  // Add the 404 not found node to the server.
-  // The path is ignored for the default node.
-  secureServer.setDefaultNode(node404);
-
-  Serial.println("Starting server...");
-  secureServer.start();
-  if (secureServer.isRunning()) {
-    Serial.println("Server ready.");
-  }
-}
-
-void loop() {
-  // This call will let the server do its work
-  secureServer.loop();
-
-  // Other code would go here...
-  delay(1);
-}
 
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+void handleRoot(HTTPRequest * req, HTTPResponse * res)
+{
   // Status code is 200 OK by default.
   // We want to deliver a simple HTML page, so we send a corresponding content type:
   res->setHeader("Content-Type", "text/html");
@@ -114,20 +67,22 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
   res->println("<h1>Hello World!</h1>");
   res->print("<p>Your server is running for ");
   // A bit of dynamic data: Show the uptime
-  res->print((int)(millis()/1000), DEC);
+  res->print((int)(millis() / 1000), DEC);
   res->println(" seconds.</p>");
   res->println("</body>");
   res->println("</html>");
 }
 
-void handleFavicon(HTTPRequest * req, HTTPResponse * res) {
+void handleFavicon(HTTPRequest * req, HTTPResponse * res)
+{
   // Set Content-Type
   res->setHeader("Content-Type", "image/vnd.microsoft.icon");
   // Write data from header file
   res->write(FAVICON_DATA, FAVICON_LENGTH);
 }
 
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res)
+{
   // Discard request body, if we received any
   // We do this, as this is the default node and may also server POST/PUT requests
   req->discardRequestBody();
@@ -146,3 +101,60 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
   res->println("<body><h1>404 Not Found</h1><p>The requested resource was not found on this server.</p></body>");
   res->println("</html>");
 }
+
+void setup() 
+{
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting Static_Page on "); Serial.println(ARDUINO_BOARD);
+  
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+  
+  while (WiFi.status() != WL_CONNECTED) 
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // For every resource available on the server, we need to create a ResourceNode
+  // The ResourceNode links URL and HTTP method to a handler function
+  ResourceNode * nodeRoot    = new ResourceNode("/", "GET", &handleRoot);
+  ResourceNode * nodeFavicon = new ResourceNode("/favicon.ico", "GET", &handleFavicon);
+  ResourceNode * node404     = new ResourceNode("", "GET", &handle404);
+
+  // Add the root node to the server
+  secureServer.registerNode(nodeRoot);
+
+  // Add the favicon
+  secureServer.registerNode(nodeFavicon);
+
+  // Add the 404 not found node to the server.
+  // The path is ignored for the default node.
+  secureServer.setDefaultNode(node404);
+
+  Serial.println("Starting server...");
+  secureServer.start();
+  
+  if (secureServer.isRunning()) 
+  {
+    Serial.println("Server ready.");
+  }
+}
+
+void loop() 
+{
+  // This call will let the server do its work
+  secureServer.loop();
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/Static-Page/cert.h b/examples/Static-Page/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Static-Page/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Static-Page/private_key.h b/examples/Static-Page/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Static-Page/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/WT32_ETH01/Async-Server/Async-Server.ino b/examples/WT32_ETH01/Async-Server/Async-Server.ino
index f8f2930..cd77319 100644
--- a/examples/WT32_ETH01/Async-Server/Async-Server.ino
+++ b/examples/WT32_ETH01/Async-Server/Async-Server.ino
@@ -153,7 +153,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting Async_Server on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Async_Server on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Async-Server/cert.h b/examples/WT32_ETH01/Async-Server/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Async-Server/cert.h
+++ b/examples/WT32_ETH01/Async-Server/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Async-Server/private_key.h b/examples/WT32_ETH01/Async-Server/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Async-Server/private_key.h
+++ b/examples/WT32_ETH01/Async-Server/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Authentication/Authentication.ino b/examples/WT32_ETH01/Authentication/Authentication.ino
index 44daa22..2aef489 100644
--- a/examples/WT32_ETH01/Authentication/Authentication.ino
+++ b/examples/WT32_ETH01/Authentication/Authentication.ino
@@ -23,7 +23,6 @@
 #include "cert.h"
 #include "private_key.h"
 
-
 //////////////////////////////////////////////////
 
 // For WT32_ETH01
@@ -44,7 +43,6 @@ IPAddress myDNS(8, 8, 8, 8);
 
 //////////////////////////////////////////////////
 
-
 // For the middleware
 #include <functional>
 
@@ -335,7 +333,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting HTTP-and-HTTPS on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Authentication on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Authentication/cert.h b/examples/WT32_ETH01/Authentication/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Authentication/cert.h
+++ b/examples/WT32_ETH01/Authentication/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Authentication/private_key.h b/examples/WT32_ETH01/Authentication/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Authentication/private_key.h
+++ b/examples/WT32_ETH01/Authentication/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/HTML-Forms/HTML-Forms.ino b/examples/WT32_ETH01/HTML-Forms/HTML-Forms.ino
index e00f136..a6e38dc 100644
--- a/examples/WT32_ETH01/HTML-Forms/HTML-Forms.ino
+++ b/examples/WT32_ETH01/HTML-Forms/HTML-Forms.ino
@@ -418,7 +418,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting HTML_Forms on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting HTML_Forms on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/HTML-Forms/cert.h b/examples/WT32_ETH01/HTML-Forms/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/HTML-Forms/cert.h
+++ b/examples/WT32_ETH01/HTML-Forms/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/HTML-Forms/private_key.h b/examples/WT32_ETH01/HTML-Forms/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/HTML-Forms/private_key.h
+++ b/examples/WT32_ETH01/HTML-Forms/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/HTTPS-and-HTTP/HTTPS-and-HTTP.ino b/examples/WT32_ETH01/HTTPS-and-HTTP/HTTPS-and-HTTP.ino
index 4fd2978..97875e3 100644
--- a/examples/WT32_ETH01/HTTPS-and-HTTP/HTTPS-and-HTTP.ino
+++ b/examples/WT32_ETH01/HTTPS-and-HTTP/HTTPS-and-HTTP.ino
@@ -117,7 +117,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting HTTP-and-HTTPS on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting HTTPS_and_HTTP on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/HTTPS-and-HTTP/cert.h b/examples/WT32_ETH01/HTTPS-and-HTTP/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/HTTPS-and-HTTP/cert.h
+++ b/examples/WT32_ETH01/HTTPS-and-HTTP/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/HTTPS-and-HTTP/private_key.h b/examples/WT32_ETH01/HTTPS-and-HTTP/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/HTTPS-and-HTTP/private_key.h
+++ b/examples/WT32_ETH01/HTTPS-and-HTTP/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Middleware/Middleware.ino b/examples/WT32_ETH01/Middleware/Middleware.ino
index c1b02d1..6605114 100644
--- a/examples/WT32_ETH01/Middleware/Middleware.ino
+++ b/examples/WT32_ETH01/Middleware/Middleware.ino
@@ -128,7 +128,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting Middleware on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Middleware on "); Serial.print(ARDUINO_BOARD);  
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Middleware/cert.h b/examples/WT32_ETH01/Middleware/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Middleware/cert.h
+++ b/examples/WT32_ETH01/Middleware/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Middleware/private_key.h b/examples/WT32_ETH01/Middleware/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Middleware/private_key.h
+++ b/examples/WT32_ETH01/Middleware/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Parameter-Validation/Parameter-Validation.ino b/examples/WT32_ETH01/Parameter-Validation/Parameter-Validation.ino
index 40ea049..7e2cf2a 100644
--- a/examples/WT32_ETH01/Parameter-Validation/Parameter-Validation.ino
+++ b/examples/WT32_ETH01/Parameter-Validation/Parameter-Validation.ino
@@ -220,7 +220,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting Parameter_Validation on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Parameter_Validation on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Parameter-Validation/cert.h b/examples/WT32_ETH01/Parameter-Validation/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Parameter-Validation/cert.h
+++ b/examples/WT32_ETH01/Parameter-Validation/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Parameter-Validation/private_key.h b/examples/WT32_ETH01/Parameter-Validation/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Parameter-Validation/private_key.h
+++ b/examples/WT32_ETH01/Parameter-Validation/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Parameters/Parameters.ino b/examples/WT32_ETH01/Parameters/Parameters.ino
index 1af89cc..051b40f 100644
--- a/examples/WT32_ETH01/Parameters/Parameters.ino
+++ b/examples/WT32_ETH01/Parameters/Parameters.ino
@@ -330,7 +330,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting Parameter on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Parameters on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Parameters/cert.h b/examples/WT32_ETH01/Parameters/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Parameters/cert.h
+++ b/examples/WT32_ETH01/Parameters/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Parameters/private_key.h b/examples/WT32_ETH01/Parameters/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Parameters/private_key.h
+++ b/examples/WT32_ETH01/Parameters/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Put-Post-Echo/Put-Post-Echo.ino b/examples/WT32_ETH01/Put-Post-Echo/Put-Post-Echo.ino
index 2fef51f..9a6eff1 100644
--- a/examples/WT32_ETH01/Put-Post-Echo/Put-Post-Echo.ino
+++ b/examples/WT32_ETH01/Put-Post-Echo/Put-Post-Echo.ino
@@ -148,7 +148,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting Put-Post-Echo on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Put_Post_Echo on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Put-Post-Echo/cert.h b/examples/WT32_ETH01/Put-Post-Echo/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Put-Post-Echo/cert.h
+++ b/examples/WT32_ETH01/Put-Post-Echo/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Put-Post-Echo/private_key.h b/examples/WT32_ETH01/Put-Post-Echo/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Put-Post-Echo/private_key.h
+++ b/examples/WT32_ETH01/Put-Post-Echo/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/REST-API/REST-API.ino b/examples/WT32_ETH01/REST-API/REST-API.ino
index 8e7b667..2281cad 100644
--- a/examples/WT32_ETH01/REST-API/REST-API.ino
+++ b/examples/WT32_ETH01/REST-API/REST-API.ino
@@ -450,7 +450,6 @@ void handlePostEvent(HTTPRequest * req, HTTPResponse * res)
     }
   }
 
-
   // Check if we could store the event
   if (eventID > -1) 
   {
@@ -514,7 +513,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting REST-API on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting REST_API on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
@@ -538,23 +537,29 @@ void setup()
     Serial.println();
 
     // If the user did not accept to try formatting SPIFFS or formatting failed:
-    if (Serial.read() != 'y' || !SPIFFS.begin(true)) {
+    if (Serial.read() != 'y' || !SPIFFS.begin(true)) 
+    {
       Serial.println("SPIFFS not available. Stop.");
       while (true);
     }
+    
     Serial.println("SPIFFS has been formated.");
   }
+  
   Serial.println("SPIFFS has been mounted.");
 
   // Now that SPIFFS is ready, we can create or load the certificate
   SSLCert *cert = getCertificate();
-  if (cert == NULL) {
+  
+  if (cert == NULL) 
+  {
     Serial.println("Could not load certificate. Stop.");
     while (true);
   }
 
   // Initialize event structure:
-  for (int i = 0; i < MAX_EVENTS; i++) {
+  for (int i = 0; i < MAX_EVENTS; i++) 
+  {
     events[i].active = false;
     events[i].gpio = 0;
     events[i].state = LOW;
diff --git a/examples/WT32_ETH01/REST-API/cert.h b/examples/WT32_ETH01/REST-API/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/REST-API/cert.h
+++ b/examples/WT32_ETH01/REST-API/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/REST-API/private_key.h b/examples/WT32_ETH01/REST-API/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/REST-API/private_key.h
+++ b/examples/WT32_ETH01/REST-API/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Self-Signed-Certificate/Self-Signed-Certificate.ino b/examples/WT32_ETH01/Self-Signed-Certificate/Self-Signed-Certificate.ino
index 80dff22..c3a61dc 100644
--- a/examples/WT32_ETH01/Self-Signed-Certificate/Self-Signed-Certificate.ino
+++ b/examples/WT32_ETH01/Self-Signed-Certificate/Self-Signed-Certificate.ino
@@ -95,7 +95,7 @@ void setup()
   Serial.begin(115200);
   delay(3000); // wait for the monitor to reconnect after uploading.
 
-  Serial.print("\nStarting Self-Signed-Certificate on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Self_Signed_Certificate on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Self-Signed-Certificate/cert.h b/examples/WT32_ETH01/Self-Signed-Certificate/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Self-Signed-Certificate/cert.h
+++ b/examples/WT32_ETH01/Self-Signed-Certificate/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Self-Signed-Certificate/private_key.h b/examples/WT32_ETH01/Self-Signed-Certificate/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Self-Signed-Certificate/private_key.h
+++ b/examples/WT32_ETH01/Self-Signed-Certificate/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Static-Page/Static-Page.ino b/examples/WT32_ETH01/Static-Page/Static-Page.ino
index 2298845..9c7dfe9 100644
--- a/examples/WT32_ETH01/Static-Page/Static-Page.ino
+++ b/examples/WT32_ETH01/Static-Page/Static-Page.ino
@@ -20,7 +20,6 @@
 // Binary data for the favicon
 #include "favicon.h"
 
-
 //////////////////////////////////////////////////
 
 // For WT32_ETH01
@@ -123,7 +122,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting Static-Page on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting Static_Page on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Static-Page/cert.h b/examples/WT32_ETH01/Static-Page/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Static-Page/cert.h
+++ b/examples/WT32_ETH01/Static-Page/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Static-Page/private_key.h b/examples/WT32_ETH01/Static-Page/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Static-Page/private_key.h
+++ b/examples/WT32_ETH01/Static-Page/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Websocket-Chat/Websocket-Chat.ino b/examples/WT32_ETH01/Websocket-Chat/Websocket-Chat.ino
index e26da57..08550d7 100644
--- a/examples/WT32_ETH01/Websocket-Chat/Websocket-Chat.ino
+++ b/examples/WT32_ETH01/Websocket-Chat/Websocket-Chat.ino
@@ -133,7 +133,10 @@ void ChatHandler::onClose()
   {
     if (activeClients[i] == this)
     {
+      ChatHandler* client = activeClients[i];
       activeClients[i] = nullptr;
+      delete client;
+      break;
     }
   }
 }
@@ -273,7 +276,7 @@ void setup()
 
   ///////////////////////////////////////////////
 
-  Serial.print("\nStarting HTTP-and-HTTPS on " + String(ARDUINO_BOARD));
+  Serial.print("\nStarting WebSocket_Chat on "); Serial.print(ARDUINO_BOARD);
   Serial.println(" with " + String(SHIELD_TYPE));
   Serial.println(WEBSERVER_WT32_ETH01_VERSION);
 
diff --git a/examples/WT32_ETH01/Websocket-Chat/cert.h b/examples/WT32_ETH01/Websocket-Chat/cert.h
index 46c87e4..c4b5c43 100644
--- a/examples/WT32_ETH01/Websocket-Chat/cert.h
+++ b/examples/WT32_ETH01/Websocket-Chat/cert.h
@@ -1,4 +1,4 @@
 #ifndef CERT_H_
 #define CERT_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/WT32_ETH01/Websocket-Chat/private_key.h b/examples/WT32_ETH01/Websocket-Chat/private_key.h
index 1d36c18..ec2498e 100644
--- a/examples/WT32_ETH01/Websocket-Chat/private_key.h
+++ b/examples/WT32_ETH01/Websocket-Chat/private_key.h
@@ -1,4 +1,4 @@
 #ifndef PRIVATE_KEY_H_
 #define PRIVATE_KEY_H_
-	#error You have to run the srcipt extras/create_cert.sh to recreate these files
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
 #endif
diff --git a/examples/Websocket-Chat/Websocket-Chat.ino b/examples/Websocket-Chat/Websocket-Chat.ino
index 989c3b6..fd4b621 100644
--- a/examples/Websocket-Chat/Websocket-Chat.ino
+++ b/examples/Websocket-Chat/Websocket-Chat.ino
@@ -1,24 +1,24 @@
 /**
- * Example for the ESP32 HTTP(S) Webserver
- *
- * IMPORTANT NOTE:
- * To run this script, you need to
- *  1) Enter your WiFi SSID and PSK below this comment
- *  2) Make sure to have certificate data available. You will find a
- *     shell script and instructions to do so in the library folder
- *     under extras/
- *
- * This script will install an HTTPS Server on your ESP32 with the following
- * functionalities:
- *  - Show a chat interface on the root node /
- *  - Use a websocket to allow multiple clients to pass messages to each other
- */
+   Example for the ESP32 HTTP(S) Webserver
+
+   IMPORTANT NOTE:
+   To run this script, you need to
+    1) Enter your WiFi SSID and PSK below this comment
+    2) Make sure to have certificate data available. You will find a
+       shell script and instructions to do so in the library folder
+       under extras/
+
+   This script will install an HTTPS Server on your ESP32 with the following
+   functionalities:
+    - Show a chat interface on the root node /
+    - Use a websocket to allow multiple clients to pass messages to each other
+*/
 
 #include <sstream>
 
 // TODO: Configure your WiFi here
-#define WIFI_SSID "<your ssid goes here>"
-#define WIFI_PSK  "<your pre-shared key goes here>"
+#define WIFI_SSID       "your_ssid"
+#define WIFI_PSK        "12345678"
 
 // Max clients to be connected to the chat
 #define MAX_CLIENTS 4
@@ -42,93 +42,40 @@ using namespace httpsserver;
 
 // Create an SSL certificate object from the files included above ...
 SSLCert cert = SSLCert(
-  example_crt_DER, example_crt_DER_len,
-  example_key_DER, example_key_DER_len
-);
+                 example_crt_DER, example_crt_DER_len,
+                 example_key_DER, example_key_DER_len
+               );
 // ... and create a server based on this certificate.
 // The constructor has some optional parameters like the TCP port that should be used
 // and the max client count. For simplicity, we use a fixed amount of clients that is bound
 // to the max client count.
 HTTPSServer secureServer = HTTPSServer(&cert, 443, MAX_CLIENTS);
 
-// Declare some handler functions for the various URLs on the server
-// The signature is always the same for those functions. They get two parameters,
-// which are pointers to the request data (read request body, headers, ...) and
-// to the response data (write response, set status code, ...)
-void handleRoot(HTTPRequest * req, HTTPResponse * res);
-void handle404(HTTPRequest * req, HTTPResponse * res);
-
 // As websockets are more complex, they need a custom class that is derived from WebsocketHandler
-class ChatHandler : public WebsocketHandler {
-public:
-  // This method is called by the webserver to instantiate a new handler for each
-  // client that connects to the websocket endpoint
-  static WebsocketHandler* create();
-
-  // This method is called when a message arrives
-  void onMessage(WebsocketInputStreambuf * input);
-
-  // Handler function on connection close
-  void onClose();
+class ChatHandler : public WebsocketHandler
+{
+  public:
+    // This method is called by the webserver to instantiate a new handler for each
+    // client that connects to the websocket endpoint
+    static WebsocketHandler* create();
+
+    // This method is called when a message arrives
+    void onMessage(WebsocketInputStreambuf * input);
+
+    // Handler function on connection close
+    void onClose();
 };
 
 // Simple array to store the active clients:
 ChatHandler* activeClients[MAX_CLIENTS];
 
-void setup() {
-  // Initialize the slots
-  for(int i = 0; i < MAX_CLIENTS; i++) activeClients[i] = nullptr;
-
-  // For logging
-  Serial.begin(115200);
-
-  // Connect to WiFi
-  Serial.println("Setting up WiFi");
-  WiFi.begin(WIFI_SSID, WIFI_PSK);
-  while (WiFi.status() != WL_CONNECTED) {
-    Serial.print(".");
-    delay(500);
-  }
-  Serial.print("Connected. IP=");
-  Serial.println(WiFi.localIP());
-
-  // For every resource available on the server, we need to create a ResourceNode
-  // The ResourceNode links URL and HTTP method to a handler function
-  ResourceNode * nodeRoot    = new ResourceNode("/", "GET", &handleRoot);
-  ResourceNode * node404     = new ResourceNode("", "GET", &handle404);
-
-  // Add the root node to the server
-  secureServer.registerNode(nodeRoot);
-
-  // The websocket handler can be linked to the server by using a WebsocketNode:
-  // (Note that the standard defines GET as the only allowed method here,
-  // so you do not need to pass it explicitly)
-  WebsocketNode * chatNode = new WebsocketNode("/chat", &ChatHandler::create);
-
-  // Adding the node to the server works in the same way as for all other nodes
-  secureServer.registerNode(chatNode);
-
-  // Finally, add the 404 not found node to the server.
-  // The path is ignored for the default node.
-  secureServer.setDefaultNode(node404);
-
-  Serial.println("Starting server...");
-  secureServer.start();
-  if (secureServer.isRunning()) {
-    Serial.print("Server ready. Open the following URL in multiple browser windows to start chatting: https://");
-    Serial.println(WiFi.localIP());
-  }
-}
-
-void loop() {
-  // This call will let the server do its work
-  secureServer.loop();
-
-  // Other code would go here...
-  delay(1);
-}
+// Handler functions for the various URLs on the server
+// The signature is always the same for those functions. They get two parameters,
+// which are pointers to the request data (read request body, headers, ...) and
+// to the response data (write response, set status code, ...)
 
-void handle404(HTTPRequest * req, HTTPResponse * res) {
+void handle404(HTTPRequest * req, HTTPResponse * res)
+{
   // Discard request body, if we received any
   // We do this, as this is the default node and may also server POST/PUT requests
   req->discardRequestBody();
@@ -150,30 +97,42 @@ void handle404(HTTPRequest * req, HTTPResponse * res) {
 
 // In the create function of the handler, we create a new Handler and keep track
 // of it using the activeClients array
-WebsocketHandler * ChatHandler::create() {
+WebsocketHandler * ChatHandler::create()
+{
   Serial.println("Creating new chat client!");
   ChatHandler * handler = new ChatHandler();
-  for(int i = 0; i < MAX_CLIENTS; i++) {
-    if (activeClients[i] == nullptr) {
+
+  for (int i = 0; i < MAX_CLIENTS; i++)
+  {
+    if (activeClients[i] == nullptr)
+    {
       activeClients[i] = handler;
       break;
     }
   }
+
   return handler;
 }
 
 // When the websocket is closing, we remove the client from the array
-void ChatHandler::onClose() {
-  for(int i = 0; i < MAX_CLIENTS; i++) {
-    if (activeClients[i] == this) {
+void ChatHandler::onClose()
+{
+  for (int i = 0; i < MAX_CLIENTS; i++)
+  {
+    if (activeClients[i] == this)
+    {
+      ChatHandler* client = activeClients[i];
       activeClients[i] = nullptr;
+      delete client;
+      break;
     }
   }
 }
 
 // Finally, passing messages around. If we receive something, we send it to all
 // other clients
-void ChatHandler::onMessage(WebsocketInputStreambuf * inbuf) {
+void ChatHandler::onMessage(WebsocketInputStreambuf * inbuf)
+{
   // Get the input message
   std::ostringstream ss;
   std::string msg;
@@ -181,17 +140,18 @@ void ChatHandler::onMessage(WebsocketInputStreambuf * inbuf) {
   msg = ss.str();
 
   // Send it back to every client
-  for(int i = 0; i < MAX_CLIENTS; i++) {
-    if (activeClients[i] != nullptr) {
+  for (int i = 0; i < MAX_CLIENTS; i++)
+  {
+    if (activeClients[i] != nullptr)
+    {
       activeClients[i]->send(msg, SEND_TYPE_TEXT);
     }
   }
 }
 
-
-
 // The following HTML code will present the chat interface.
-void handleRoot(HTTPRequest * req, HTTPResponse * res) {
+void handleRoot(HTTPRequest * req, HTTPResponse * res)
+{
   res->setHeader("Content-Type", "text/html");
 
   res->print(
@@ -291,3 +251,68 @@ void handleRoot(HTTPRequest * req, HTTPResponse * res) {
     "</html>\n"
   );
 }
+
+void setup()
+{
+  // Initialize the slots
+  for (int i = 0; i < MAX_CLIENTS; i++) activeClients[i] = nullptr;
+
+  // For logging
+  Serial.begin(115200);
+  while (!Serial && millis() < 5000);
+
+  ///////////////////////////////////////////////
+
+  Serial.print("\nStarting Websocket_Chat on "); Serial.println(ARDUINO_BOARD);
+
+  // Connect to WiFi
+  Serial.println("Setting up WiFi");
+  WiFi.begin(WIFI_SSID, WIFI_PSK);
+
+  while (WiFi.status() != WL_CONNECTED)
+  {
+    Serial.print(".");
+    delay(500);
+  }
+
+  Serial.print("Connected. IP=");
+  Serial.println(WiFi.localIP());
+
+  // For every resource available on the server, we need to create a ResourceNode
+  // The ResourceNode links URL and HTTP method to a handler function
+  ResourceNode * nodeRoot    = new ResourceNode("/", "GET", &handleRoot);
+  ResourceNode * node404     = new ResourceNode("", "GET", &handle404);
+
+  // Add the root node to the server
+  secureServer.registerNode(nodeRoot);
+
+  // The websocket handler can be linked to the server by using a WebsocketNode:
+  // (Note that the standard defines GET as the only allowed method here,
+  // so you do not need to pass it explicitly)
+  WebsocketNode * chatNode = new WebsocketNode("/chat", &ChatHandler::create);
+
+  // Adding the node to the server works in the same way as for all other nodes
+  secureServer.registerNode(chatNode);
+
+  // Finally, add the 404 not found node to the server.
+  // The path is ignored for the default node.
+  secureServer.setDefaultNode(node404);
+
+  Serial.println("Starting server...");
+  secureServer.start();
+
+  if (secureServer.isRunning())
+  {
+    Serial.print("Server ready. Open the following URL in multiple browser windows to start chatting: https://");
+    Serial.println(WiFi.localIP());
+  }
+}
+
+void loop()
+{
+  // This call will let the server do its work
+  secureServer.loop();
+
+  // Other code would go here...
+  delay(1);
+}
diff --git a/examples/Websocket-Chat/cert.h b/examples/Websocket-Chat/cert.h
new file mode 100644
index 0000000..c4b5c43
--- /dev/null
+++ b/examples/Websocket-Chat/cert.h
@@ -0,0 +1,4 @@
+#ifndef CERT_H_
+#define CERT_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/examples/Websocket-Chat/private_key.h b/examples/Websocket-Chat/private_key.h
new file mode 100644
index 0000000..ec2498e
--- /dev/null
+++ b/examples/Websocket-Chat/private_key.h
@@ -0,0 +1,4 @@
+#ifndef PRIVATE_KEY_H_
+#define PRIVATE_KEY_H_
+  #error You have to run the srcipt extras/create_cert.sh to recreate these files
+#endif
diff --git a/src/HTTPConnection.cpp b/src/HTTPConnection.cpp
index 0ab739c..75f15ef 100644
--- a/src/HTTPConnection.cpp
+++ b/src/HTTPConnection.cpp
@@ -137,8 +137,10 @@ void HTTPConnection::closeConnection() {
     _httpHeaders = NULL;
   }
 
-  if (_wsHandler != nullptr) {
+  if (_wsHandler != nullptr) 
+  {
     HTTPS_LOGD("Free WS Handler");
+    _wsHandler->onClose(); 
     delete _wsHandler;
     _wsHandler = NULL;
   }
@@ -206,7 +208,7 @@ int HTTPConnection::updateBuffer() {
         } else {
           // An error occured
           _connectionState = STATE_ERROR;
-          HTTPS_LOGE("An receive error occured, FID=%d", _socket);
+          HTTPS_LOGE("A receive error occurred, FID=%d, code=%d", _socket, readReturnCode); 
           closeConnection();
           return -1;
         }
@@ -252,9 +254,13 @@ size_t HTTPConnection::readBuffer(byte* buffer, size_t length) {
   return length;
 }
 
-size_t HTTPConnection::pendingBufferSize() {
+size_t HTTPConnection::pendingBufferSize() 
+{
   updateBuffer();
-
+  
+  if (isClosed()) 
+    return 0;
+    
   return _bufferUnusedIdx - _bufferProcessed + pendingByteCount();
 }
 
@@ -588,17 +594,21 @@ void HTTPConnection::loop() {
       }
 
       // If the handler has terminated the connection, clean up and close the socket too
-      if (_wsHandler->closed() || _clientState == CSTATE_CLOSED) {
-        HTTPS_LOGI("WS closed, freeing Handler, FID=%d", _socket);
-        delete _wsHandler;
-        _wsHandler = nullptr;
-        _connectionState = STATE_CLOSING;
+      if (_wsHandler != nullptr){
+        if (_wsHandler->closed() || _clientState == CSTATE_CLOSED) {
+          HTTPS_LOGI("WS closed, freeing Handler, FID=%d", _socket);
+          delete _wsHandler;
+          _wsHandler = nullptr;
+          _connectionState = STATE_CLOSING;
+        }
+      } else {
+        HTTPS_LOGI("WS closed due to SSL level issue and cleanded up");  
       }
       break;
-    default:;
+    default:
+      break;
     }
   }
-
 }
 
 
diff --git a/src/HTTPSCallbackFunction.hpp b/src/HTTPSCallbackFunction.hpp
index 1329e38..8d37456 100644
--- a/src/HTTPSCallbackFunction.hpp
+++ b/src/HTTPSCallbackFunction.hpp
@@ -8,7 +8,7 @@ namespace httpsserver {
   /**
    * \brief A callback function that will be called by the server to handle a request
    */
-  typedef void (HTTPSCallbackFunction)(HTTPRequest * req, HTTPResponse * res);
+  typedef void (HTTPSCallbackFunction)(HTTPRequest * req, HTTPResponse * res); 
 }
 
 #endif /* SRC_HTTPSCALLBACKFUNCTION_HPP_ */
diff --git a/src/HTTPSConnection.cpp b/src/HTTPSConnection.cpp
index e0e3dd0..481770d 100644
--- a/src/HTTPSConnection.cpp
+++ b/src/HTTPSConnection.cpp
@@ -108,8 +108,16 @@ size_t HTTPSConnection::writeBuffer(byte* buffer, size_t length) {
   return SSL_write(_ssl, buffer, length);
 }
 
-size_t HTTPSConnection::readBytesToBuffer(byte* buffer, size_t length) {
-  return SSL_read(_ssl, buffer, length);
+size_t HTTPSConnection::readBytesToBuffer(byte* buffer, size_t length) 
+{
+  int ret = SSL_read(_ssl, buffer, length);
+  
+  if (ret < 0) 
+  {
+	  HTTPS_LOGD("SSL_read error: %d",  SSL_get_error(_ssl, ret));
+  }
+  
+  return ret;
 }
 
 size_t HTTPSConnection::pendingByteCount() {
diff --git a/src/ResourceNode.hpp b/src/ResourceNode.hpp
index c7c4519..3a091da 100644
--- a/src/ResourceNode.hpp
+++ b/src/ResourceNode.hpp
@@ -10,7 +10,7 @@ namespace httpsserver {
 
 /**
  * \brief This HTTPNode represents a route that maps to a regular HTTP request for a resource (static or dynamic)
- * 
+ *
  * It therefore contrasts to the WebsocketNode, which handles requests for Websockets.
  */
 class ResourceNode : public HTTPNode {