diff --git a/WebServer.cpp b/WebServer.cpp
deleted file mode 100644
index 5d9a88d..0000000
--- a/WebServer.cpp
+++ /dev/null
@@ -1,740 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil;  c-file-style: "k&r"; c-basic-offset: 2; -*-
-
-   Webduino, a simple Arduino web server
-   Copyright 2009 Ben Combee, Ran Talbott
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-*/
-
-#include <WebServer.h>
-
-WebServer::WebServer(const char *urlPrefix, int port) :
-  m_server(port),
-  m_client(255),
-  m_urlPrefix(urlPrefix),
-  m_pushbackDepth(0),
-  m_cmdCount(0),
-  m_contentLength(0),
-  m_failureCmd(&defaultFailCmd),
-  m_defaultCmd(&defaultFailCmd)
-{
-}
-
-void WebServer::begin()
-{
-  m_server.begin();
-}
-
-void WebServer::setDefaultCommand(Command *cmd)
-{
-  m_defaultCmd = cmd;
-}
-
-void WebServer::setFailureCommand(Command *cmd)
-{
-  m_failureCmd = cmd;
-}
-
-void WebServer::addCommand(const char *verb, Command *cmd)
-{
-  if (m_cmdCount < SIZE(m_commands))
-  {
-    m_commands[m_cmdCount].verb = verb;
-    m_commands[m_cmdCount++].cmd = cmd;
-  }
-}
-
-void WebServer::write(uint8_t ch)
-{
-  m_client.write(ch);
-}
-
-void WebServer::write(const char *str)
-{
-  m_client.write(str);
-}
-
-void WebServer::write(const uint8_t *buffer, size_t size)
-{
-  m_client.write(buffer, size);
-}
-
-void WebServer::write(const char *buffer, size_t length)
-{
-  m_client.write((const uint8_t *)buffer, length);
-}
-
-void WebServer::writeP(const prog_uchar *data, size_t length)
-{
-  // copy data out of program memory into local storage, write out in
-  // chunks of 32 bytes to avoid extra short TCP/IP packets
-  uint8_t buffer[32];
-  size_t bufferEnd = 0;
-
-  while (length--)
-  {
-    if (bufferEnd == 32)
-    {
-      m_client.write(buffer, 32);
-      bufferEnd = 0;
-    }
-
-    buffer[bufferEnd++] = pgm_read_byte(data++);
-  }
-
-  if (bufferEnd > 0)
-    m_client.write(buffer, bufferEnd);
-}
-
-void WebServer::printP(const prog_uchar *str)
-{
-  // copy data out of program memory into local storage, write out in
-  // chunks of 32 bytes to avoid extra short TCP/IP packets
-  uint8_t buffer[32];
-  size_t bufferEnd = 0;
-  
-  while (buffer[bufferEnd++] = pgm_read_byte(str++))
-  {
-    if (bufferEnd == 32)
-    {
-      m_client.write(buffer, 32);
-      bufferEnd = 0;
-    }
-  }
-
-  // write out everything left but trailing NUL
-  if (bufferEnd > 1)
-    m_client.write(buffer, bufferEnd - 1);
-}
-
-void WebServer::printCRLF()
-{
-  m_client.write((const uint8_t *)"\r\n", 2);
-}
-
-bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
-        bool tail_complete)
-{
-  if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
-  {
-    m_defaultCmd(*this, requestType, verb, tail_complete);
-    return true;
-  }
-  // We now know that the URL contains at least one character.  And,
-  // if the first character is a slash,  there's more after it.
-  if (verb[0] == '/')
-  {
-    char i;
-    char *qm_loc;
-    int verb_len;
-    int qm_offset;
-    // Skip over the leading "/",  because it makes the code more
-    // efficient and easier to understand.
-    verb++;
-    // Look for a "?" separating the filename part of the URL from the
-    // parameters.  If it's not there, compare to the whole URL.
-    qm_loc = strchr(verb, '?');
-    verb_len = (qm_loc == NULL) ? strlen(verb) : (qm_loc - verb);
-    qm_offset = (qm_loc == NULL) ? 0 : 1;
-    for (i = 0; i < m_cmdCount; ++i)
-    {
-      if ((verb_len == strlen(m_commands[i].verb))
-          && (strncmp(verb, m_commands[i].verb, verb_len) == 0))
-      {
-        // Skip over the "verb" part of the URL (and the question
-        // mark, if present) when passing it to the "action" routine
-        m_commands[i].cmd(*this, requestType,
-        verb + verb_len + qm_offset,
-        tail_complete);
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-// processConnection with a default buffer
-void WebServer::processConnection()
-{
-  char request[WEBDUINO_DEFAULT_REQUEST_LENGTH];
-  int  request_len = WEBDUINO_DEFAULT_REQUEST_LENGTH;
-  processConnection(request, &request_len);
-}
-
-void WebServer::processConnection(char *buff, int *bufflen)
-{
-  m_client = m_server.available();
-
-  if (m_client) {
-    m_readingContent = false;
-    buff[0] = 0;
-    ConnectionType requestType = INVALID;
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.println("*** checking request ***");
-#endif
-    getRequest(requestType, buff, bufflen);
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.print("*** requestType = ");
-    Serial.print((int)requestType);
-    Serial.println(", request = \"");
-    Serial.print(buff);
-    Serial.println("\" ***");
-#endif
-    processHeaders();
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.println("*** headers complete ***");
-#endif
-
-    int urlPrefixLen = strlen(m_urlPrefix);
-    if (strcmp(buff, "/robots.txt") == 0)
-    {
-      noRobots(requestType);
-    }
-    else if (requestType == INVALID ||
-             strncmp(buff, m_urlPrefix, urlPrefixLen) != 0 ||
-             !dispatchCommand(requestType, buff + urlPrefixLen,
-                              (*bufflen) >= 0))
-    {
-      m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
-    }
-
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-    Serial.println("*** stopping connection ***");
-#endif
-    m_client.stop();
-  }
-}
-
-void WebServer::httpFail()
-{
-  P(failMsg) =
-    "HTTP/1.0 400 Bad Request" CRLF
-    WEBDUINO_SERVER_HEADER
-    "Content-Type: text/html" CRLF
-    CRLF
-    WEBDUINO_FAIL_MESSAGE;
-
-  printP(failMsg);
-}
-
-void WebServer::defaultFailCmd(WebServer &server,
-                               WebServer::ConnectionType type,
-                               char *url_tail,
-                               bool tail_complete)
-{
-  server.httpFail();
-}
-
-void WebServer::noRobots(ConnectionType type)
-{
-  httpSuccess("text/plain");
-  if (type != HEAD)
-  {
-    P(allowNoneMsg) = "User-agent: *" CRLF "Disallow: /" CRLF;
-    printP(allowNoneMsg);
-  }
-}
-
-void WebServer::httpSuccess(const char *contentType,
-                            const char *extraHeaders)
-{
-  P(successMsg1) =
-    "HTTP/1.0 200 OK" CRLF
-    WEBDUINO_SERVER_HEADER
-    "Access-Control-Allow-Origin: *" CRLF
-	"Content-Type: ";
-
-  printP(successMsg1);
-  print(contentType);
-  printCRLF();
-  if (extraHeaders)
-    print(extraHeaders);
-  printCRLF();
-}
-
-void WebServer::httpSeeOther(const char *otherURL)
-{
-  P(seeOtherMsg) =
-    "HTTP/1.0 303 See Other" CRLF
-    WEBDUINO_SERVER_HEADER
-    "Location: ";
-
-  printP(seeOtherMsg);
-  print(otherURL);
-  printCRLF();
-  printCRLF();
-}
-
-int WebServer::read()
-{
-  if (m_client == NULL)
-    return -1;
-
-  if (m_pushbackDepth == 0)
-  {
-    unsigned long timeoutTime = millis() + WEBDUINO_READ_TIMEOUT_IN_MS;
-
-    while (m_client.connected())
-    {
-      // stop reading the socket early if we get to content-length
-      // characters in the POST.  This is because some clients leave
-      // the socket open because they assume HTTP keep-alive.
-      if (m_readingContent)
-      {
-        if (m_contentLength == 0)
-        {
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-          Serial.println("\n*** End of content, terminating connection");
-#endif
-          return -1;
-        }
-        --m_contentLength;
-      }
-
-      int ch = m_client.read();
-
-      // if we get a character, return it, otherwise continue in while
-      // loop, checking connection status
-      if (ch != -1)
-      {
-#if WEBDUINO_SERIAL_DEBUGGING
-        if (ch == '\r')
-          Serial.print("<CR>");
-        else if (ch == '\n')
-          Serial.println("<LF>");
-        else
-          Serial.print((char)ch);
-#endif
-        return ch;
-      }
-      else
-      {
-        unsigned long now = millis();
-        if (now > timeoutTime)
-        {
-          // connection timed out, destroy client, return EOF
-#if WEBDUINO_SERIAL_DEBUGGING
-          Serial.println("*** Connection timed out");
-#endif
-          m_client.flush();
-          m_client.stop();
-          return -1;
-        }
-      }
-    }
-
-    // connection lost, return EOF
-#if WEBDUINO_SERIAL_DEBUGGING
-    Serial.println("*** Connection lost");
-#endif
-    return -1;
-  }
-  else
-    return m_pushback[--m_pushbackDepth];
-}
-
-void WebServer::push(int ch)
-{
-  // don't allow pushing EOF
-  if (ch == -1)
-    return;
-
-  m_pushback[m_pushbackDepth++] = ch;
-  // can't raise error here, so just replace last char over and over
-  if (m_pushbackDepth == SIZE(m_pushback))
-    m_pushbackDepth = SIZE(m_pushback) - 1;
-}
-
-void WebServer::reset()
-{
-  m_pushbackDepth = 0;
-}
-
-bool WebServer::expect(const char *str)
-{
-  const char *curr = str;
-  while (*curr != 0)
-  {
-    int ch = read();
-    if (ch != *curr++)
-    {
-      // push back ch and the characters we accepted
-      push(ch);
-      while (--curr != str)
-        push(curr[-1]);
-      return false;
-    }
-  }
-  return true;
-}
-
-bool WebServer::readInt(int &number)
-{
-  bool negate = false;
-  bool gotNumber = false;
-  int ch;
-  number = 0;
-
-  // absorb whitespace
-  do
-  {
-    ch = read();
-  } while (ch == ' ' || ch == '\t');
-
-  // check for leading minus sign
-  if (ch == '-')
-  {
-    negate = true;
-    ch = read();
-  }
-
-  // read digits to update number, exit when we find non-digit
-  while (ch >= '0' && ch <= '9')
-  {
-    gotNumber = true;
-    number = number * 10 + ch - '0';
-    ch = read();
-  }
-
-  push(ch);
-  if (negate)
-    number = -number;
-  return gotNumber;
-}
-
-bool WebServer::readPOSTparam(char *name, int nameLen,
-                              char *value, int valueLen)
-{
-  // assume name is at current place in stream
-  int ch;
-
-  // clear out name and value so they'll be NUL terminated
-  memset(name, 0, nameLen);
-  memset(value, 0, valueLen);
-
-  // decrement length so we don't write into NUL terminator
-  --nameLen;
-  --valueLen;
-
-  while ((ch = read()) != -1)
-  {
-    if (ch == '+')
-    {
-      ch = ' ';
-    }
-    else if (ch == '=')
-    {
-      /* that's end of name, so switch to storing in value */
-      nameLen = 0;
-      continue;
-    }
-    else if (ch == '&')
-    {
-      /* that's end of pair, go away */
-      return true;
-    }
-    else if (ch == '%')
-    {
-      /* handle URL encoded characters by converting back to original form */
-      int ch1 = read();
-      int ch2 = read();
-      if (ch1 == -1 || ch2 == -1)
-        return false;
-      char hex[3] = { ch1, ch2, 0 };
-      ch = strtoul(hex, NULL, 16);
-    }
-
-    // check against 1 so we don't overwrite the final NUL
-    if (nameLen > 1)
-    {
-      *name++ = ch;
-      --nameLen;
-    }
-    else if (valueLen > 1)
-    {
-      *value++ = ch;
-      --valueLen;
-    }
-  }
-
-  // if we get here, we hit the end-of-file, so POST is over and there
-  // are no more parameters
-  return false;
-}
-
-/* Retrieve a parameter that was encoded as part of the URL, stored in
- * the buffer pointed to by *tail.  tail is updated to point just past
- * the last character read from the buffer. */
-URLPARAM_RESULT WebServer::nextURLparam(char **tail, char *name, int nameLen,
-                                        char *value, int valueLen)
-{
-  // assume name is at current place in stream
-  char ch, hex[3];
-  URLPARAM_RESULT result = URLPARAM_OK;
-  char *s = *tail;
-  bool keep_scanning = true;
-  bool need_value = true;
-
-  // clear out name and value so they'll be NUL terminated
-  memset(name, 0, nameLen);
-  memset(value, 0, valueLen);
-
-  if (*s == 0)
-    return URLPARAM_EOS;
-  // Read the keyword name
-  while (keep_scanning)
-  {
-    ch = *s++;
-    switch (ch)
-    {
-    case 0:
-      s--;  // Back up to point to terminating NUL
-      // Fall through to "stop the scan" code
-    case '&':
-      /* that's end of pair, go away */
-      keep_scanning = false;
-      need_value = false;
-      break;
-    case '+':
-      ch = ' ';
-      break;
-    case '%':
-      /* handle URL encoded characters by converting back
-       * to original form */
-      if ((hex[0] = *s++) == 0)
-      {
-        s--;        // Back up to NUL
-        keep_scanning = false;
-        need_value = false;
-      }
-      else
-      {
-        if ((hex[1] = *s++) == 0)
-        {
-          s--;  // Back up to NUL
-          keep_scanning = false;
-          need_value = false;
-        }
-        else
-        {
-          hex[2] = 0;
-          ch = strtoul(hex, NULL, 16);
-        }
-      }
-      break;
-    case '=':
-      /* that's end of name, so switch to storing in value */
-      keep_scanning = false;
-      break;
-    }
-
-
-    // check against 1 so we don't overwrite the final NUL
-    if (keep_scanning && (nameLen > 1))
-    {
-      *name++ = ch;
-      --nameLen;
-    }
-    else
-      result = URLPARAM_NAME_OFLO;
-  }
-
-  if (need_value && (*s != 0))
-  {
-    keep_scanning = true;
-    while (keep_scanning)
-    {
-      ch = *s++;
-      switch (ch)
-      {
-      case 0:
-        s--;  // Back up to point to terminating NUL
-              // Fall through to "stop the scan" code
-      case '&':
-        /* that's end of pair, go away */
-        keep_scanning = false;
-        need_value = false;
-        break;
-      case '+':
-        ch = ' ';
-        break;
-      case '%':
-        /* handle URL encoded characters by converting back to original form */
-        if ((hex[0] = *s++) == 0)
-        {
-          s--;  // Back up to NUL
-          keep_scanning = false;
-          need_value = false;
-        }
-        else
-        {
-          if ((hex[1] = *s++) == 0)
-          {
-            s--;  // Back up to NUL
-            keep_scanning = false;
-            need_value = false;
-          }
-          else
-          {
-            hex[2] = 0;
-            ch = strtoul(hex, NULL, 16);
-          }
-
-        }
-        break;
-      }
-
-
-      // check against 1 so we don't overwrite the final NUL
-      if (keep_scanning && (valueLen > 1))
-      {
-        *value++ = ch;
-        --valueLen;
-      }
-      else
-        result = (result == URLPARAM_OK) ?
-          URLPARAM_VALUE_OFLO :
-          URLPARAM_BOTH_OFLO;
-    }
-  }
-  *tail = s;
-  return result;
-}
-
-
-
-// Read and parse the first line of the request header.
-// The "command" (GET/HEAD/POST) is translated into a numeric value in type.
-// The URL is stored in request,  up to the length passed in length
-// NOTE 1: length must include one byte for the terminating NUL.
-// NOTE 2: request is NOT checked for NULL,  nor length for a value < 1.
-// Reading stops when the code encounters a space, CR, or LF.  If the HTTP
-// version was supplied by the client,  it will still be waiting in the input
-// stream when we exit.
-//
-// On return, length contains the amount of space left in request.  If it's
-// less than 0,  the URL was longer than the buffer,  and part of it had to
-// be discarded.
-
-void WebServer::getRequest(WebServer::ConnectionType &type,
-                           char *request, int *length)
-{
-  --*length; // save room for NUL
-
-  type = INVALID;
-
-  // store the GET/POST line of the request
-  if (expect("GET "))
-    type = GET;
-  else if (expect("HEAD "))
-    type = HEAD;
-  else if (expect("POST "))
-    type = POST;
-
-  // if it doesn't start with any of those, we have an unknown method
-  // so just eat rest of header
-
-  int ch;
-  while ((ch = read()) != -1)
-  {
-    // stop storing at first space or end of line
-    if (ch == ' ' || ch == '\n' || ch == '\r')
-    {
-      break;
-    }
-    if (*length > 0)
-    {
-      *request = ch;
-      ++request;
-      --*length;
-    }
-  }
-  // NUL terminate
-  *request = 0;
-}
-
-void WebServer::processHeaders()
-{
-  // look for two things: the Content-Length header and the double-CRLF
-  // that ends the headers.
-
-  while (1)
-  {
-    if (expect("Content-Length:"))
-    {
-      readInt(m_contentLength);
-#if WEBDUINO_SERIAL_DEBUGGING > 1
-      Serial.print("\n*** got Content-Length of ");
-      Serial.print(m_contentLength);
-      Serial.print(" ***");
-#endif
-      continue;
-    }
-
-    if (expect(CRLF CRLF))
-    {
-      m_readingContent = true;
-      return;
-    }
-
-    // no expect checks hit, so just absorb a character and try again
-    if (read() == -1)
-    {
-      return;
-    }
-  }
-}
-
-void WebServer::outputCheckboxOrRadio(const char *element, const char *name,
-                                      const char *val, const char *label,
-                                      bool selected)
-{
-  P(cbPart1a) = "<label><input type='";
-  P(cbPart1b) = "' name='";
-  P(cbPart2) = "' value='";
-  P(cbPart3) = "' ";
-  P(cbChecked) = "checked ";
-  P(cbPart4) = "/> ";
-  P(cbPart5) = "</label>";
-
-  printP(cbPart1a);
-  print(element);
-  printP(cbPart1b);
-  print(name);
-  printP(cbPart2);
-  print(val);
-  printP(cbPart3);
-  if (selected)
-    printP(cbChecked);
-  printP(cbPart4);
-  print(label);
-  printP(cbPart5);
-}
-
-void WebServer::checkBox(const char *name, const char *val,
-                         const char *label, bool selected)
-{
-  outputCheckboxOrRadio("checkbox", name, val, label, selected);
-}
-
-void WebServer::radioButton(const char *name, const char *val,
-                            const char *label, bool selected)
-{
-  outputCheckboxOrRadio("radio", name, val, label, selected);
-}
diff --git a/WebServer.h b/WebServer.h
index bdcd614..c8c43c3 100644
--- a/WebServer.h
+++ b/WebServer.h
@@ -1,7 +1,8 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil;  c-file-style: "k&r"; c-basic-offset: 2; -*-
 
    Webduino, a simple Arduino web server
-   Copyright 2009 Ben Combee, Ran Talbott
+   Copyright 2009-2014 Ben Combee, Ran Talbott, Christopher Lee, Martin Lormes
+   Francisco M Cuenca-Acuna
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -27,23 +28,17 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "avr/pgmspace.h"
 
-#include <Client.h>
-#include <Server.h>
+#include <Ethernet.h>
+#include <EthernetClient.h>
+#include <EthernetServer.h>
 
 /********************************************************************
  * CONFIGURATION
  ********************************************************************/
 
-#define WEBDUINO_VERSION 1004
-#define WEBDUINO_VERSION_STRING "1.4"
-
-#if WEBDUINO_SUPRESS_SERVER_HEADER
-#define WEBDUINO_SERVER_HEADER ""
-#else
-#define WEBDUINO_SERVER_HEADER "Server: Webduino/" WEBDUINO_VERSION_STRING CRLF
-#endif
+#define WEBDUINO_VERSION 1007
+#define WEBDUINO_VERSION_STRING "1.7"
 
 // standard END-OF-LINE marker in HTTP
 #define CRLF "\r\n"
@@ -58,10 +53,70 @@
 #define WEBDUINO_READ_TIMEOUT_IN_MS 1000
 #endif
 
+#ifndef WEBDUINO_COMMANDS_COUNT
+#define WEBDUINO_COMMANDS_COUNT 8
+#endif
+
+#ifndef WEBDUINO_URL_PATH_COMMAND_LENGTH
+#define WEBDUINO_URL_PATH_COMMAND_LENGTH 8
+#endif
+
 #ifndef WEBDUINO_FAIL_MESSAGE
 #define WEBDUINO_FAIL_MESSAGE "<h1>EPIC FAIL</h1>"
 #endif
 
+#ifndef WEBDUINO_AUTH_REALM
+#define WEBDUINO_AUTH_REALM "Webduino"
+#endif // #ifndef WEBDUINO_AUTH_REALM
+
+#ifndef WEBDUINO_AUTH_MESSAGE
+#define WEBDUINO_AUTH_MESSAGE "<h1>401 Unauthorized</h1>"
+#endif // #ifndef WEBDUINO_AUTH_MESSAGE
+
+#ifndef WEBDUINO_SERVER_ERROR_MESSAGE
+#define WEBDUINO_SERVER_ERROR_MESSAGE "<h1>500 Internal Server Error</h1>"
+#endif // WEBDUINO_SERVER_ERROR_MESSAGE
+
+#ifndef WEBDUINO_OUTPUT_BUFFER_SIZE
+#define WEBDUINO_OUTPUT_BUFFER_SIZE 32
+#endif // WEBDUINO_OUTPUT_BUFFER_SIZE
+
+// add '#define WEBDUINO_FAVICON_DATA ""' to your application
+// before including WebServer.h to send a null file as the favicon.ico file
+// otherwise this defaults to a 16x16 px black diode on blue ground
+// (or include your own icon if you like)
+#ifndef WEBDUINO_FAVICON_DATA
+#define WEBDUINO_FAVICON_DATA { 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, \
+                                0x10, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, \
+                                0xb0, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, \
+                                0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, \
+                                0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, \
+                                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, \
+                                0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, \
+                                0x00, 0xff, 0xff, 0x00, 0x00, 0xcf, 0xbf, \
+                                0x00, 0x00, 0xc7, 0xbf, 0x00, 0x00, 0xc3, \
+                                0xbf, 0x00, 0x00, 0xc1, 0xbf, 0x00, 0x00, \
+                                0xc0, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0xc0, 0xbf, 0x00, 0x00, 0xc1, 0xbf, \
+                                0x00, 0x00, 0xc3, 0xbf, 0x00, 0x00, 0xc7, \
+                                0xbf, 0x00, 0x00, 0xcf, 0xbf, 0x00, 0x00, \
+                                0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+                                0x00, 0x00 }
+#endif // #ifndef WEBDUINO_FAVICON_DATA
+
 // add "#define WEBDUINO_SERIAL_DEBUGGING 1" to your application
 // before including WebServer.h to have incoming requests logged to
 // the serial port.
@@ -76,11 +131,18 @@
 extern "C" unsigned long millis(void);
 
 // declare a static string
-#define P(name)   static const prog_uchar name[] PROGMEM
+#ifdef __AVR__
+#define P(name)   static const unsigned char name[] __attribute__(( section(".progmem." #name) ))
+#else
+#define P(name)   static const unsigned char name[]
+#endif
 
 // returns the number of elements in the array
 #define SIZE(array) (sizeof(array) / sizeof(*array))
 
+#ifdef _VARIANT_ARDUINO_DUE_X_
+#define pgm_read_byte(ptr) (unsigned char)(* ptr)
+#endif
 /********************************************************************
  * DECLARATIONS
  ********************************************************************/
@@ -89,18 +151,18 @@ extern "C" unsigned long millis(void);
  * when you call nextURLparam AFTER the last parameter is read.  The
  * last actual parameter gets an "OK" return code. */
 
-typedef enum URLPARAM_RESULT { URLPARAM_OK,
-                               URLPARAM_NAME_OFLO,
-                               URLPARAM_VALUE_OFLO,
-                               URLPARAM_BOTH_OFLO,
-                               URLPARAM_EOS         // No params left
+enum URLPARAM_RESULT { URLPARAM_OK,
+                       URLPARAM_NAME_OFLO,
+                       URLPARAM_VALUE_OFLO,
+                       URLPARAM_BOTH_OFLO,
+                       URLPARAM_EOS         // No params left
 };
 
 class WebServer: public Print
 {
 public:
   // passed to a command to indicate what kind of request was received
-  enum ConnectionType { INVALID, GET, HEAD, POST };
+  enum ConnectionType { INVALID, GET, HEAD, POST, PUT, DELETE, PATCH };
 
   // any commands registered with the web server have to follow
   // this prototype.
@@ -111,8 +173,15 @@ class WebServer: public Print
   typedef void Command(WebServer &server, ConnectionType type,
                        char *url_tail, bool tail_complete);
 
+  // Prototype for the optional function which consumes the URL path itself.
+  // url_path contains pointers to the seperate parts of the URL path where '/'
+  //          was used as the delimiter.
+  typedef void UrlPathCommand(WebServer &server, ConnectionType type,
+                              char **url_path, char *url_tail,
+                              bool tail_complete);
+
   // constructor for webserver object
-  WebServer(const char *urlPrefix = "/", int port = 80);
+  WebServer(const char *urlPrefix = "", uint16_t port = 80);
 
   // start listening for connections
   void begin();
@@ -137,15 +206,29 @@ class WebServer: public Print
   // add a new command to be run at the URL specified by verb
   void addCommand(const char *verb, Command *cmd);
 
+  // Set command that's run if default command or URL specified commands do
+  // not run, uses extra url_path parameter to allow resolving the URL in the
+  // function.
+  void setUrlPathCommand(UrlPathCommand *cmd);
+
   // utility function to output CRLF pair
   void printCRLF();
 
   // output a string stored in program memory, usually one defined
   // with the P macro
-  void printP(const prog_uchar *str);
+  void printP(const unsigned char *str);
+
+  // inline overload for printP to handle signed char strings
+  void printP(const char *str) { printP((unsigned char*)str); }
+
+  // support for C style formating
+  void printf(char *fmt, ... );
+  #ifdef F
+  void printf(const __FlashStringHelper *format, ... );
+  #endif
 
   // output raw data stored in program memory
-  void writeP(const prog_uchar *data, size_t length);
+  void writeP(const unsigned char *data, size_t length);
 
   // output HTML for a radio button
   void radioButton(const char *name, const char *val,
@@ -171,6 +254,10 @@ class WebServer: public Print
   // value or 0 if nothing was read.
   bool readInt(int &number);
 
+  // reads a header value, stripped of possible whitespace in front,
+  // from the server stream
+  void readHeader(char *value, int valueLen);
+
   // Read the next keyword parameter from the socket.  Assumes that other
   // code has already skipped over the headers,  and the next thing to
   // be read will be the start of a keyword.
@@ -185,9 +272,26 @@ class WebServer: public Print
   URLPARAM_RESULT nextURLparam(char **tail, char *name, int nameLen,
                                char *value, int valueLen);
 
+  // compare string against credentials in current request
+  //
+  // authCredentials must be Base64 encoded outside of Webduino
+  // (I wanted to be easy on the resources)
+  //
+  // returns true if strings match, false otherwise
+  bool checkCredentials(const char authCredentials[45]);
+
   // output headers and a message indicating a server error
   void httpFail();
 
+  // output headers and a message indicating "401 Unauthorized"
+  void httpUnauthorized();
+
+  // output headers and a message indicating "500 Internal Server Error"
+  void httpServerError();
+
+  // output headers indicating "204 No Content" and no further message
+  void httpNoContent();
+
   // output standard headers indicating "200 Success".  You can change the
   // type of the data you're outputting or also add extra headers like
   // "Refresh: 1".  Extra headers should each be terminated with CRLF.
@@ -200,20 +304,27 @@ class WebServer: public Print
   void httpSeeOther(const char *otherURL);
 
   // implementation of write used to implement Print interface
-  virtual void write(uint8_t);
-  virtual void write(const char *str);
-  virtual void write(const uint8_t *buffer, size_t size);
-  void write(const char *data, size_t length);
+  virtual size_t write(uint8_t);
+  virtual size_t write(const uint8_t *buffer, size_t size);
 
+  // tells if there is anything to process
+  uint8_t available();
+
+  // Flush the send buffer
+  void flushBuf(); 
+
+  // Close the current connection and flush ethernet buffers
+  void reset(); 
 private:
-  Server m_server;
-  Client m_client;
+  EthernetServer m_server;
+  EthernetClient m_client;
   const char *m_urlPrefix;
 
-  char m_pushback[32];
-  char m_pushbackDepth;
+  unsigned char m_pushback[32];
+  unsigned char m_pushbackDepth;
 
   int m_contentLength;
+  char m_authCredentials[51];
   bool m_readingContent;
 
   Command *m_failureCmd;
@@ -222,10 +333,13 @@ class WebServer: public Print
   {
     const char *verb;
     Command *cmd;
-  } m_commands[8];
-  char m_cmdCount;
+  } m_commands[WEBDUINO_COMMANDS_COUNT];
+  unsigned char m_cmdCount;
+  UrlPathCommand *m_urlPathCmd;
+
+  uint8_t m_buffer[WEBDUINO_OUTPUT_BUFFER_SIZE];
+  uint8_t m_bufFill;
 
-  void reset();
   void getRequest(WebServer::ConnectionType &type, char *request, int *length);
   bool dispatchCommand(ConnectionType requestType, char *verb,
                        bool tail_complete);
@@ -237,6 +351,970 @@ class WebServer: public Print
   static void defaultFailCmd(WebServer &server, ConnectionType type,
                              char *url_tail, bool tail_complete);
   void noRobots(ConnectionType type);
+  void favicon(ConnectionType type);
 };
 
+/* define this macro if you want to include the header in a sketch source
+   file but not define any of the implementation. This is useful if
+   multiple source files are using the Webduino class. */
+#ifndef WEBDUINO_NO_IMPLEMENTATION
+
+/********************************************************************
+ * IMPLEMENTATION
+ ********************************************************************/
+
+WebServer::WebServer(const char *urlPrefix, uint16_t port) :
+  m_server(port),
+  m_client(),
+  m_urlPrefix(urlPrefix),
+  m_pushbackDepth(0),
+  m_contentLength(0),
+  m_failureCmd(&defaultFailCmd),
+  m_defaultCmd(&defaultFailCmd),
+  m_cmdCount(0),
+  m_urlPathCmd(NULL),
+  m_bufFill(0)
+{
+}
+
+P(webServerHeader) = "Server: Webduino/" WEBDUINO_VERSION_STRING CRLF;
+
+void WebServer::begin()
+{
+  m_server.begin();
+}
+
+void WebServer::setDefaultCommand(Command *cmd)
+{
+  m_defaultCmd = cmd;
+}
+
+void WebServer::setFailureCommand(Command *cmd)
+{
+  m_failureCmd = cmd;
+}
+
+void WebServer::addCommand(const char *verb, Command *cmd)
+{
+  if (m_cmdCount < SIZE(m_commands))
+  {
+    m_commands[m_cmdCount].verb = verb;
+    m_commands[m_cmdCount++].cmd = cmd;
+  }
+}
+
+void WebServer::setUrlPathCommand(UrlPathCommand *cmd)
+{
+  m_urlPathCmd = cmd;
+}
+
+size_t WebServer::write(uint8_t ch)
+{
+  m_buffer[m_bufFill++] = ch;
+
+  if(m_bufFill == sizeof(m_buffer))
+  {
+    m_client.write(m_buffer, sizeof(m_buffer));
+    m_bufFill = 0;
+  }
+
+  return sizeof(ch);
+}
+
+size_t WebServer::write(const uint8_t *buffer, size_t size)
+{
+  flushBuf(); //Flush any buffered output
+  return m_client.write(buffer, size);
+}
+
+void WebServer::flushBuf()
+{
+  if(m_bufFill > 0)
+  {
+    m_client.write(m_buffer, m_bufFill);
+    m_bufFill = 0;
+  }
+}
+
+void WebServer::writeP(const unsigned char *data, size_t length)
+{
+  // copy data out of program memory into local storage
+
+  while (length--)
+  {
+    write(pgm_read_byte(data++));
+  }
+}
+
+void WebServer::printP(const unsigned char *str)
+{
+  // copy data out of program memory into local storage
+
+  while (uint8_t value = pgm_read_byte(str++))
+  {
+    write(value);
+  }
+}
+
+void WebServer::printCRLF()
+{
+  print(CRLF);
+}
+
+void WebServer::printf(char *fmt, ... )
+{
+  char tmp[128]; // resulting string limited to 128 chars
+  va_list args;
+  va_start (args, fmt );
+  vsnprintf(tmp, 128, fmt, args);
+  va_end (args);
+  print(tmp);
+}
+
+#ifdef F
+void WebServer::printf(const __FlashStringHelper *format, ... )
+{
+  char buf[128]; // resulting string limited to 128 chars
+  va_list ap;
+  va_start(ap, format);
+#ifdef __AVR__
+  vsnprintf_P(buf, sizeof(buf), (const char *)format, ap); // progmem for AVR
+#else
+  vsnprintf(buf, sizeof(buf), (const char *)format, ap); // for the rest of the world
+#endif  
+  va_end(ap);
+  print(buf);
+}
+#endif
+
+bool WebServer::dispatchCommand(ConnectionType requestType, char *verb,
+        bool tail_complete)
+{
+  // if there is no URL, i.e. we have a prefix and it's requested without a
+  // trailing slash or if the URL is just the slash
+  if ((verb[0] == 0) || ((verb[0] == '/') && (verb[1] == 0)))
+  {
+    m_defaultCmd(*this, requestType, (char*)"", tail_complete);
+    return true;
+  }
+  // if the URL is just a slash followed by a question mark
+  // we're looking at the default command with GET parameters passed
+  if ((verb[0] == '/') && (verb[1] == '?'))
+  {
+    verb+=2; // skip over the "/?" part of the url
+    m_defaultCmd(*this, requestType, verb, tail_complete);
+    return true;
+  }
+  // We now know that the URL contains at least one character.  And,
+  // if the first character is a slash,  there's more after it.
+  if (verb[0] == '/')
+  {
+    uint8_t i;
+    char *qm_loc;
+    uint16_t verb_len;
+    uint8_t qm_offset;
+    // Skip over the leading "/",  because it makes the code more
+    // efficient and easier to understand.
+    verb++;
+    // Look for a "?" separating the filename part of the URL from the
+    // parameters.  If it's not there, compare to the whole URL.
+    qm_loc = strchr(verb, '?');
+    verb_len = (qm_loc == NULL) ? strlen(verb) : (qm_loc - verb);
+    qm_offset = (qm_loc == NULL) ? 0 : 1;
+    for (i = 0; i < m_cmdCount; ++i)
+    {
+      if ((verb_len == strlen(m_commands[i].verb))
+          && (strncmp(verb, m_commands[i].verb, verb_len) == 0))
+      {
+        // Skip over the "verb" part of the URL (and the question
+        // mark, if present) when passing it to the "action" routine
+        m_commands[i].cmd(*this, requestType,
+        verb + verb_len + qm_offset,
+        tail_complete);
+        return true;
+      }
+    }
+    // Check if UrlPathCommand is assigned.
+    if (m_urlPathCmd != NULL)
+    {
+      // Initialize with null bytes, so number of parts can be determined.
+      char *url_path[WEBDUINO_URL_PATH_COMMAND_LENGTH] = {0};
+      uint8_t part = 0;
+
+      // URL path should be terminated with null byte.
+      *(verb + verb_len) = 0;
+
+      // First URL path part is at the start of verb.
+      url_path[part++] = verb;
+      // Replace all slashes ('/') with a null byte so every part of the URL
+      // path is a seperate string. Add every char following a '/' as a new
+      // part of the URL, even if that char is a '/' (which will be replaced
+      // with a null byte).
+      for (char * p = verb; p < verb + verb_len; p++)
+      {
+        if (*p == '/')
+        {
+          *p = 0;
+          url_path[part++] = p + 1;
+          // Don't try to assign out of array bounds.
+          if (part == WEBDUINO_URL_PATH_COMMAND_LENGTH) break;
+        }
+      }
+      m_urlPathCmd(*this, requestType, url_path,
+                   verb + verb_len + qm_offset, tail_complete);
+      return true;
+    }
+  }
+  return false;
+}
+
+// processConnection with a default buffer
+void WebServer::processConnection()
+{
+  char request[WEBDUINO_DEFAULT_REQUEST_LENGTH];
+  int  request_len = WEBDUINO_DEFAULT_REQUEST_LENGTH;
+  processConnection(request, &request_len);
+}
+
+void WebServer::processConnection(char *buff, int *bufflen)
+{
+  int urlPrefixLen = strlen(m_urlPrefix);
+
+  m_client = m_server.available();
+
+  if (m_client) {
+    m_readingContent = false;
+    buff[0] = 0;
+    ConnectionType requestType = INVALID;
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+    Serial.println("*** checking request ***");
+#endif
+    getRequest(requestType, buff, bufflen);
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+    Serial.print("*** requestType = ");
+    Serial.print((int)requestType);
+    Serial.print(", request = \"");
+    Serial.print(buff);
+    Serial.println("\" ***");
+#endif
+
+    // don't even look further at invalid requests.
+    // this is done to prevent Webduino from hanging
+    // - when there are illegal requests,
+    // - when someone contacts it through telnet rather than proper HTTP,
+    // - etc.
+    if (requestType != INVALID)
+    {
+      processHeaders();
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+      Serial.println("*** headers complete ***");
+#endif
+
+      if (strcmp(buff, "/robots.txt") == 0)
+      {
+        noRobots(requestType);
+      }
+      else if (strcmp(buff, "/favicon.ico") == 0)
+      {
+        favicon(requestType);
+      }
+    }
+    // Only try to dispatch command if request type and prefix are correct.
+    // Fix by quarencia.
+    if (requestType == INVALID ||
+        strncmp(buff, m_urlPrefix, urlPrefixLen) != 0)
+    {
+      m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
+    }
+    else if (!dispatchCommand(requestType, buff + urlPrefixLen,
+             (*bufflen) >= 0))
+    {
+      m_failureCmd(*this, requestType, buff, (*bufflen) >= 0);
+    }
+
+    flushBuf();
+
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+    Serial.println("*** stopping connection ***");
+#endif
+    reset();
+  }
+}
+
+bool WebServer::checkCredentials(const char authCredentials[45])
+{
+  char basic[7] = "Basic ";
+  if((0 == strncmp(m_authCredentials,basic,6)) &&
+     (0 == strcmp(authCredentials, m_authCredentials + 6))) return true;
+  return false;
+}
+
+void WebServer::httpFail()
+{
+  P(failMsg1) = "HTTP/1.0 400 Bad Request" CRLF;
+  printP(failMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(failMsg2) = 
+    "Content-Type: text/html" CRLF
+    CRLF
+    WEBDUINO_FAIL_MESSAGE;
+
+  printP(failMsg2);
+}
+
+void WebServer::defaultFailCmd(WebServer &server,
+                               WebServer::ConnectionType type,
+                               char *url_tail,
+                               bool tail_complete)
+{
+  server.httpFail();
+}
+
+void WebServer::noRobots(ConnectionType type)
+{
+  httpSuccess("text/plain");
+  if (type != HEAD)
+  {
+    P(allowNoneMsg) = "User-agent: *" CRLF "Disallow: /" CRLF;
+    printP(allowNoneMsg);
+  }
+}
+
+void WebServer::favicon(ConnectionType type)
+{
+  httpSuccess("image/x-icon","Cache-Control: max-age=31536000\r\n");
+  if (type != HEAD)
+  {
+    P(faviconIco) = WEBDUINO_FAVICON_DATA;
+    writeP(faviconIco, sizeof(faviconIco));
+  }
+}
+
+void WebServer::httpUnauthorized()
+{
+  P(unauthMsg1) = "HTTP/1.0 401 Authorization Required" CRLF;
+  printP(unauthMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(unauthMsg2) = 
+    "Content-Type: text/html" CRLF
+    "WWW-Authenticate: Basic realm=\"" WEBDUINO_AUTH_REALM "\"" CRLF
+    CRLF
+    WEBDUINO_AUTH_MESSAGE;
+
+  printP(unauthMsg2);
+}
+
+void WebServer::httpServerError()
+{
+  P(servErrMsg1) = "HTTP/1.0 500 Internal Server Error" CRLF;
+  printP(servErrMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(servErrMsg2) = 
+    "Content-Type: text/html" CRLF
+    CRLF
+    WEBDUINO_SERVER_ERROR_MESSAGE;
+
+  printP(servErrMsg2);
+}
+
+void WebServer::httpNoContent()
+{
+  P(noContentMsg1) = "HTTP/1.0 204 NO CONTENT" CRLF;
+  printP(noContentMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(noContentMsg2) = 
+    CRLF
+    CRLF;
+
+  printP(noContentMsg2);
+}
+
+void WebServer::httpSuccess(const char *contentType,
+                            const char *extraHeaders)
+{
+  P(successMsg1) = "HTTP/1.0 200 OK" CRLF;
+  printP(successMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(successMsg2) = 
+    "Access-Control-Allow-Origin: *" CRLF
+    "Content-Type: ";
+
+  printP(successMsg2);
+  print(contentType);
+  printCRLF();
+  if (extraHeaders)
+    print(extraHeaders);
+  printCRLF();
+}
+
+void WebServer::httpSeeOther(const char *otherURL)
+{
+  P(seeOtherMsg1) = "HTTP/1.0 303 See Other" CRLF;
+  printP(seeOtherMsg1);
+
+#ifndef WEBDUINO_SUPRESS_SERVER_HEADER
+  printP(webServerHeader);
+#endif
+
+  P(seeOtherMsg2) = "Location: ";
+  printP(seeOtherMsg2);
+  print(otherURL);
+  printCRLF();
+  printCRLF();
+}
+
+int WebServer::read()
+{
+  if (!m_client)
+    return -1;
+
+  if (m_pushbackDepth == 0)
+  {
+    unsigned long timeoutTime = millis() + WEBDUINO_READ_TIMEOUT_IN_MS;
+
+    while (m_client.connected())
+    {
+      // stop reading the socket early if we get to content-length
+      // characters in the POST.  This is because some clients leave
+      // the socket open because they assume HTTP keep-alive.
+      if (m_readingContent)
+      {
+        if (m_contentLength == 0)
+        {
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+          Serial.println("\n*** End of content, terminating connection");
+#endif
+          return -1;
+        }
+      }
+
+      int ch = m_client.read();
+
+      // if we get a character, return it, otherwise continue in while
+      // loop, checking connection status
+      if (ch != -1)
+      {
+        // count character against content-length
+        if (m_readingContent)
+        {
+          --m_contentLength;
+        }
+
+#if WEBDUINO_SERIAL_DEBUGGING
+        if (ch == '\r')
+          Serial.print("<CR>");
+        else if (ch == '\n')
+          Serial.println("<LF>");
+        else
+          Serial.print((char)ch);
+#endif
+        return ch;
+      }
+      else
+      {
+        unsigned long now = millis();
+        if (now > timeoutTime)
+        {
+          // connection timed out, destroy client, return EOF
+#if WEBDUINO_SERIAL_DEBUGGING
+          Serial.println("*** Connection timed out");
+#endif
+          reset();
+          return -1;
+        }
+      }
+    }
+
+    // connection lost, return EOF
+#if WEBDUINO_SERIAL_DEBUGGING
+    Serial.println("*** Connection lost");
+#endif
+    return -1;
+  }
+  else
+    return m_pushback[--m_pushbackDepth];
+}
+
+void WebServer::push(int ch)
+{
+  // don't allow pushing EOF
+  if (ch == -1)
+    return;
+
+  m_pushback[m_pushbackDepth++] = ch;
+  // can't raise error here, so just replace last char over and over
+  if (m_pushbackDepth == SIZE(m_pushback))
+    m_pushbackDepth = SIZE(m_pushback) - 1;
+}
+
+void WebServer::reset()
+{
+  m_pushbackDepth = 0;
+  m_client.flush();
+  m_client.stop();
+}
+
+bool WebServer::expect(const char *str)
+{
+  const char *curr = str;
+  while (*curr != 0)
+  {
+    int ch = read();
+    if (ch != *curr++)
+    {
+      // push back ch and the characters we accepted
+      push(ch);
+      while (--curr != str)
+        push(curr[-1]);
+      return false;
+    }
+  }
+  return true;
+}
+
+bool WebServer::readInt(int &number)
+{
+  bool negate = false;
+  bool gotNumber = false;
+  int ch;
+  number = 0;
+
+  // absorb whitespace
+  do
+  {
+    ch = read();
+  } while (ch == ' ' || ch == '\t');
+
+  // check for leading minus sign
+  if (ch == '-')
+  {
+    negate = true;
+    ch = read();
+  }
+
+  // read digits to update number, exit when we find non-digit
+  while (ch >= '0' && ch <= '9')
+  {
+    gotNumber = true;
+    number = number * 10 + ch - '0';
+    ch = read();
+  }
+
+  push(ch);
+  if (negate)
+    number = -number;
+  return gotNumber;
+}
+
+void WebServer::readHeader(char *value, int valueLen)
+{
+  int ch;
+  memset(value, 0, valueLen);
+  --valueLen;
+
+  // absorb whitespace
+  do
+  {
+    ch = read();
+  } while (ch == ' ' || ch == '\t');
+
+  // read rest of line
+  do
+  {
+    if (valueLen > 1)
+    {
+      *value++=ch;
+      --valueLen;
+    }
+    ch = read();
+  } while (ch != '\r');
+  push(ch);
+}
+
+bool WebServer::readPOSTparam(char *name, int nameLen,
+                              char *value, int valueLen)
+{
+  // assume name is at current place in stream
+  int ch;
+  // to not to miss the last parameter
+  bool foundSomething = false;
+
+  // clear out name and value so they'll be NUL terminated
+  memset(name, 0, nameLen);
+  memset(value, 0, valueLen);
+
+  // decrement length so we don't write into NUL terminator
+  --nameLen;
+  --valueLen;
+
+  while ((ch = read()) != -1)
+  {
+    foundSomething = true;
+    if (ch == '+')
+    {
+      ch = ' ';
+    }
+    else if (ch == '=')
+    {
+      /* that's end of name, so switch to storing in value */
+      nameLen = 0;
+      continue;
+    }
+    else if (ch == '&')
+    {
+      /* that's end of pair, go away */
+      return true;
+    }
+    else if (ch == '%')
+    {
+      /* handle URL encoded characters by converting back to original form */
+      int ch1 = read();
+      int ch2 = read();
+      if (ch1 == -1 || ch2 == -1)
+        return false;
+      char hex[3] = { (char)ch1, (char)ch2, '\0' };
+      ch = strtoul(hex, NULL, 16);
+    }
+
+    // output the new character into the appropriate buffer or drop it if
+    // there's no room in either one.  This code will malfunction in the
+    // case where the parameter name is too long to fit into the name buffer,
+    // but in that case, it will just overflow into the value buffer so
+    // there's no harm.
+    if (nameLen > 0)
+    {
+      *name++ = ch;
+      --nameLen;
+    }
+    else if (valueLen > 0)
+    {
+      *value++ = ch;
+      --valueLen;
+    }
+  }
+
+  if (foundSomething)
+  {
+    // if we get here, we have one last parameter to serve
+    return true;
+  }
+  else
+  {
+    // if we get here, we hit the end-of-file, so POST is over and there
+    // are no more parameters
+    return false;
+  }
+}
+
+/* Retrieve a parameter that was encoded as part of the URL, stored in
+ * the buffer pointed to by *tail.  tail is updated to point just past
+ * the last character read from the buffer. */
+URLPARAM_RESULT WebServer::nextURLparam(char **tail, char *name, int nameLen,
+                                        char *value, int valueLen)
+{
+  // assume name is at current place in stream
+  char ch, hex[3];
+  URLPARAM_RESULT result = URLPARAM_OK;
+  char *s = *tail;
+  bool keep_scanning = true;
+  bool need_value = true;
+
+  // clear out name and value so they'll be NUL terminated
+  memset(name, 0, nameLen);
+  memset(value, 0, valueLen);
+
+  if (*s == 0)
+    return URLPARAM_EOS;
+  // Read the keyword name
+  while (keep_scanning)
+  {
+    ch = *s++;
+    switch (ch)
+    {
+    case 0:
+      s--;  // Back up to point to terminating NUL
+      // Fall through to "stop the scan" code
+    case '&':
+      /* that's end of pair, go away */
+      keep_scanning = false;
+      need_value = false;
+      break;
+    case '+':
+      ch = ' ';
+      break;
+    case '%':
+      /* handle URL encoded characters by converting back
+       * to original form */
+      if ((hex[0] = *s++) == 0)
+      {
+        s--;        // Back up to NUL
+        keep_scanning = false;
+        need_value = false;
+      }
+      else
+      {
+        if ((hex[1] = *s++) == 0)
+        {
+          s--;  // Back up to NUL
+          keep_scanning = false;
+          need_value = false;
+        }
+        else
+        {
+          hex[2] = 0;
+          ch = strtoul(hex, NULL, 16);
+        }
+      }
+      break;
+    case '=':
+      /* that's end of name, so switch to storing in value */
+      keep_scanning = false;
+      break;
+    }
+
+
+    // check against 1 so we don't overwrite the final NUL
+    if (keep_scanning && (nameLen > 1))
+    {
+      *name++ = ch;
+      --nameLen;
+    }
+    else if(keep_scanning)
+      result = URLPARAM_NAME_OFLO;
+  }
+
+  if (need_value && (*s != 0))
+  {
+    keep_scanning = true;
+    while (keep_scanning)
+    {
+      ch = *s++;
+      switch (ch)
+      {
+      case 0:
+        s--;  // Back up to point to terminating NUL
+              // Fall through to "stop the scan" code
+      case '&':
+        /* that's end of pair, go away */
+        keep_scanning = false;
+        need_value = false;
+        break;
+      case '+':
+        ch = ' ';
+        break;
+      case '%':
+        /* handle URL encoded characters by converting back to original form */
+        if ((hex[0] = *s++) == 0)
+        {
+          s--;  // Back up to NUL
+          keep_scanning = false;
+          need_value = false;
+        }
+        else
+        {
+          if ((hex[1] = *s++) == 0)
+          {
+            s--;  // Back up to NUL
+            keep_scanning = false;
+            need_value = false;
+          }
+          else
+          {
+            hex[2] = 0;
+            ch = strtoul(hex, NULL, 16);
+          }
+
+        }
+        break;
+      }
+
+
+      // check against 1 so we don't overwrite the final NUL
+      if (keep_scanning && (valueLen > 1))
+      {
+        *value++ = ch;
+        --valueLen;
+      }
+      else if(keep_scanning)
+        result = (result == URLPARAM_OK) ?
+          URLPARAM_VALUE_OFLO :
+          URLPARAM_BOTH_OFLO;
+    }
+  }
+  *tail = s;
+  return result;
+}
+
+
+
+// Read and parse the first line of the request header.
+// The "command" (GET/HEAD/POST) is translated into a numeric value in type.
+// The URL is stored in request,  up to the length passed in length
+// NOTE 1: length must include one byte for the terminating NUL.
+// NOTE 2: request is NOT checked for NULL,  nor length for a value < 1.
+// Reading stops when the code encounters a space, CR, or LF.  If the HTTP
+// version was supplied by the client,  it will still be waiting in the input
+// stream when we exit.
+//
+// On return, length contains the amount of space left in request.  If it's
+// less than 0,  the URL was longer than the buffer,  and part of it had to
+// be discarded.
+
+void WebServer::getRequest(WebServer::ConnectionType &type,
+                           char *request, int *length)
+{
+  --*length; // save room for NUL
+
+  type = INVALID;
+
+  // store the HTTP method line of the request
+  if (expect("GET "))
+    type = GET;
+  else if (expect("HEAD "))
+    type = HEAD;
+  else if (expect("POST "))
+    type = POST;
+  else if (expect("PUT "))
+    type = PUT;
+  else if (expect("DELETE "))
+    type = DELETE;
+  else if (expect("PATCH "))
+    type = PATCH;
+
+  // if it doesn't start with any of those, we have an unknown method
+  // so just get out of here
+  else
+    return;
+
+  int ch;
+  while ((ch = read()) != -1)
+  {
+    // stop storing at first space or end of line
+    if (ch == ' ' || ch == '\n' || ch == '\r')
+    {
+      break;
+    }
+    if (*length > 0)
+    {
+      *request = ch;
+      ++request;
+    }
+    --*length;
+  }
+  // NUL terminate
+  *request = 0;
+}
+
+void WebServer::processHeaders()
+{
+  // look for three things: the Content-Length header, the Authorization
+  // header, and the double-CRLF that ends the headers.
+
+  // empty the m_authCredentials before every run of this function.
+  // otherwise users who don't send an Authorization header would be treated
+  // like the last user who tried to authenticate (possibly successful)
+  m_authCredentials[0]=0;
+
+  while (1)
+  {
+    if (expect("Content-Length:"))
+    {
+      readInt(m_contentLength);
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+      Serial.print("\n*** got Content-Length of ");
+      Serial.print(m_contentLength);
+      Serial.print(" ***");
+#endif
+      continue;
+    }
+
+    if (expect("Authorization:"))
+    {
+      readHeader(m_authCredentials,51);
+#if WEBDUINO_SERIAL_DEBUGGING > 1
+      Serial.print("\n*** got Authorization: of ");
+      Serial.print(m_authCredentials);
+      Serial.print(" ***");
+#endif
+      continue;
+    }
+
+    if (expect(CRLF CRLF))
+    {
+      m_readingContent = true;
+      return;
+    }
+
+    // no expect checks hit, so just absorb a character and try again
+    if (read() == -1)
+    {
+      return;
+    }
+  }
+}
+
+void WebServer::outputCheckboxOrRadio(const char *element, const char *name,
+                                      const char *val, const char *label,
+                                      bool selected)
+{
+  P(cbPart1a) = "<label><input type='";
+  P(cbPart1b) = "' name='";
+  P(cbPart2) = "' value='";
+  P(cbPart3) = "' ";
+  P(cbChecked) = "checked ";
+  P(cbPart4) = "/> ";
+  P(cbPart5) = "</label>";
+
+  printP(cbPart1a);
+  print(element);
+  printP(cbPart1b);
+  print(name);
+  printP(cbPart2);
+  print(val);
+  printP(cbPart3);
+  if (selected)
+    printP(cbChecked);
+  printP(cbPart4);
+  print(label);
+  printP(cbPart5);
+}
+
+void WebServer::checkBox(const char *name, const char *val,
+                         const char *label, bool selected)
+{
+  outputCheckboxOrRadio("checkbox", name, val, label, selected);
+}
+
+void WebServer::radioButton(const char *name, const char *val,
+                            const char *label, bool selected)
+{
+  outputCheckboxOrRadio("radio", name, val, label, selected);
+}
+
+uint8_t WebServer::available(){
+  return m_server.available();
+}
+
+#endif // WEBDUINO_NO_IMPLEMENTATION
+
 #endif // WEBDUINO_H_
diff --git a/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde b/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.ino
similarity index 92%
rename from examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde
rename to examples/Web_AjaxBuzzer/Web_AjaxBuzzer.ino
index 0fc5649..e546030 100644
--- a/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.pde
+++ b/examples/Web_AjaxBuzzer/Web_AjaxBuzzer.ino
@@ -73,11 +73,10 @@ void buzzCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
     P(message) = 
 "<!DOCTYPE html><html><head>"
   "<title>Webduino AJAX Buzzer Example</title>"
-  "<link href='http://jqueryui.com/latest/themes/base/ui.all.css' rel=stylesheet />"
+  "<link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css' rel=stylesheet />"
   //"<meta http-equiv='Content-Script-Type' content='text/javascript'>"
-  "<script src='http://jqueryui.com/latest/jquery-1.3.2.js'></script>"
-  "<script src='http://jqueryui.com/latest/ui/ui.core.js'></script>"
-  "<script src='http://jqueryui.com/latest/ui/ui.slider.js'></script>"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'></script>"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js'></script>"
   "<style> #slider { margin: 10px; } </style>"
   "<script>"
     "function changeBuzz(event, ui) { $('#indicator').text(ui.value); $.post('/buzz', { buzz: ui.value } ); }"
diff --git a/examples/Web_AjaxRGB/Web_AjaxRGB.ino b/examples/Web_AjaxRGB/Web_AjaxRGB.ino
new file mode 100644
index 0000000..8e05a8c
--- /dev/null
+++ b/examples/Web_AjaxRGB/Web_AjaxRGB.ino
@@ -0,0 +1,142 @@
+/* Web_AjaxRGB.pde - example sketch for Webduino library */
+
+#include "SPI.h"
+#include "Ethernet.h"
+#include "WebServer.h"
+
+// CHANGE THIS TO YOUR OWN UNIQUE VALUE
+static uint8_t mac[6] = { 0x02, 0xAA, 0xBB, 0xCC, 0x00, 0x22 };
+
+// CHANGE THIS TO MATCH YOUR HOST NETWORK
+static uint8_t ip[4] = { 192, 168, 1, 210 }; // area 51!
+
+/* all URLs on this server will start with /rgb because of how we
+ * define the PREFIX value.  We also will listen on port 80, the
+ * standard HTTP service port */
+#define PREFIX "/rgb"
+WebServer webserver(PREFIX, 80);
+
+#define RED_PIN 5
+#define GREEN_PIN 3
+#define BLUE_PIN 6
+
+int red = 0;            //integer for red darkness
+int blue = 0;           //integer for blue darkness
+int green = 0;          //integer for green darkness
+
+/* This command is set as the default command for the server.  It
+ * handles both GET and POST requests.  For a GET, it returns a simple
+ * page with some buttons.  For a POST, it saves the value posted to
+ * the red/green/blue variable, affecting the output of the speaker */
+void rgbCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  if (type == WebServer::POST)
+  {
+    bool repeat;
+    char name[16], value[16];
+    do
+    {
+      /* readPOSTparam returns false when there are no more parameters
+       * to read from the input.  We pass in buffers for it to store
+       * the name and value strings along with the length of those
+       * buffers. */
+      repeat = server.readPOSTparam(name, 16, value, 16);
+
+      /* this is a standard string comparison function.  It returns 0
+       * when there's an exact match.  We're looking for a parameter
+       * named red/green/blue here. */
+      if (strcmp(name, "red") == 0)
+      {
+	/* use the STRing TO Unsigned Long function to turn the string
+	 * version of the color strength value into our integer red/green/blue
+	 * variable */
+        red = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "green") == 0)
+      {
+        green = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "blue") == 0)
+      {
+        blue = strtoul(value, NULL, 10);
+      }
+    } while (repeat);
+    
+    // after procesing the POST data, tell the web browser to reload
+    // the page using a GET method. 
+    server.httpSeeOther(PREFIX);
+//    Serial.print(name);
+//    Serial.println(value);
+
+    return;
+  }
+
+  /* for a GET or HEAD, send the standard "it's all OK headers" */
+  server.httpSuccess();
+
+  /* we don't output the body for a HEAD request */
+  if (type == WebServer::GET)
+  {
+    /* store the HTML in program memory using the P macro */
+    P(message) = 
+"<!DOCTYPE html><html><head>"
+  "<title>Webduino AJAX RGB Example</title>"
+  "<link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css' rel=stylesheet />"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'></script>"
+  "<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js'></script>"
+  "<style> body { background: black; } #red, #green, #blue { margin: 10px; } #red { background: #f00; } #green { background: #0f0; } #blue { background: #00f; } </style>"
+  "<script>"
+
+// change color on mouse up, not while sliding (causes much less traffic to the Arduino):
+//    "function changeRGB(event, ui) { var id = $(this).attr('id'); if (id == 'red') $.post('/rgb', { red: ui.value } ); if (id == 'green') $.post('/rgb', { green: ui.value } ); if (id == 'blue') $.post('/rgb', { blue: ui.value } ); } "
+//    "$(document).ready(function(){ $('#red, #green, #blue').slider({min: 0, max:255, change:changeRGB}); });"
+
+// change color on slide and mouse up (causes more traffic to the Arduino):
+    "function changeRGB(event, ui) { jQuery.ajaxSetup({timeout: 110}); /*not to DDoS the Arduino, you might have to change this to some threshold value that fits your setup*/ var id = $(this).attr('id'); if (id == 'red') $.post('/rgb', { red: ui.value } ); if (id == 'green') $.post('/rgb', { green: ui.value } ); if (id == 'blue') $.post('/rgb', { blue: ui.value } ); } "
+    "$(document).ready(function(){ $('#red, #green, #blue').slider({min: 0, max:255, change:changeRGB, slide:changeRGB}); });"
+
+  "</script>"
+"</head>"
+"<body style='font-size:62.5%;'>"
+  "<div id=red></div>"
+  "<div id=green></div>"
+  "<div id=blue></div>"
+"</body>"
+"</html>";
+
+    server.printP(message);
+  }
+}
+
+void setup()
+{
+  pinMode(RED_PIN, OUTPUT);
+  pinMode(GREEN_PIN, OUTPUT);
+  pinMode(BLUE_PIN, OUTPUT);
+
+//  Serial.begin(9600);
+
+  // setup the Ehternet library to talk to the Wiznet board
+  Ethernet.begin(mac, ip);
+
+  /* register our default command (activated with the request of
+   * http://x.x.x.x/rgb */
+  webserver.setDefaultCommand(&rgbCmd);
+
+  /* start the server to wait for connections */
+  webserver.begin();
+}
+
+void loop()
+{
+  // process incoming connections one at a time forever
+  webserver.processConnection();
+//  Serial.print(red);
+//  Serial.print(" ");
+//  Serial.print(green);
+//  Serial.print(" ");
+//  Serial.println(blue);
+  analogWrite(RED_PIN, red);
+  analogWrite(GREEN_PIN, green);
+  analogWrite(BLUE_PIN, blue);
+}
diff --git a/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.ino b/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.ino
new file mode 100644
index 0000000..aa49ee2
--- /dev/null
+++ b/examples/Web_AjaxRGB_mobile/Web_AjaxRGB_mobile.ino
@@ -0,0 +1,140 @@
+/* Web_AjaxRGB_mobile.pde - example sketch for Webduino library */
+/* -  offers web-based slider controllers for RGB led  - */
+
+#include "SPI.h"
+#include "Ethernet.h"
+#include "WebServer.h"
+
+// CHANGE THIS TO YOUR OWN UNIQUE VALUE
+static uint8_t mac[6] = { 0x02, 0xAA, 0xBB, 0xCC, 0x00, 0x22 };
+
+// CHANGE THIS TO MATCH YOUR HOST NETWORK
+static uint8_t ip[4] = { 192, 168, 1, 210 }; // area 51!
+
+/* all URLs on this server will start with /rgb because of how we
+ * define the PREFIX value.  We also will listen on port 80, the
+ * standard HTTP service port */
+#define PREFIX "/rgb"
+WebServer webserver(PREFIX, 80);
+
+#define RED_PIN 5
+#define GREEN_PIN 3
+#define BLUE_PIN 6
+
+int red = 0;            //integer for red darkness
+int blue = 0;           //integer for blue darkness
+int green = 0;          //integer for green darkness
+
+/* This command is set as the default command for the server.  It
+ * handles both GET and POST requests.  For a GET, it returns a simple
+ * page with some buttons.  For a POST, it saves the value posted to
+ * the red/green/blue variable, affecting the output of the speaker */
+void rgbCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  if (type == WebServer::POST)
+  {
+    bool repeat;
+    char name[16], value[16];
+    do
+    {
+      /* readPOSTparam returns false when there are no more parameters
+       * to read from the input.  We pass in buffers for it to store
+       * the name and value strings along with the length of those
+       * buffers. */
+      repeat = server.readPOSTparam(name, 16, value, 16);
+
+      /* this is a standard string comparison function.  It returns 0
+       * when there's an exact match.  We're looking for a parameter
+       * named red/green/blue here. */
+      if (strcmp(name, "red") == 0)
+      {
+	/* use the STRing TO Unsigned Long function to turn the string
+	 * version of the color strength value into our integer red/green/blue
+	 * variable */
+        red = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "green") == 0)
+      {
+        green = strtoul(value, NULL, 10);
+      }
+      if (strcmp(name, "blue") == 0)
+      {
+        blue = strtoul(value, NULL, 10);
+      }
+    } while (repeat);
+    
+    // after procesing the POST data, tell the web browser to reload
+    // the page using a GET method. 
+    server.httpSeeOther(PREFIX);
+//    Serial.print(name);
+//    Serial.println(value);
+
+    return;
+  }
+
+  /* for a GET or HEAD, send the standard "it's all OK headers" */
+  server.httpSuccess();
+
+  /* we don't output the body for a HEAD request */
+  if (type == WebServer::GET)
+  {
+    /* store the HTML in program memory using the P macro */
+    P(message) = 
+"<!DOCTYPE html><html><head>"
+  "<meta charset=\"utf-8\"><meta name=\"apple-mobile-web-app-capable\" content=\"yes\" /><meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\"><meta name=\"viewport\" content=\"width=device-width, user-scalable=no\">"
+  "<title>Webduino RGB</title>"
+  "<link rel=\"stylesheet\" href=\"http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css\" />"
+  "<script src=\"http://code.jquery.com/jquery-1.6.4.min.js\"></script>"
+  "<script src=\"http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.js\"></script>"
+  "<style> body, .ui-page { background: black; } .ui-body { padding-bottom: 1.5em; } div.ui-slider { width: 88%; } #red, #green, #blue { display: block; margin: 10px; } #red { background: #f00; } #green { background: #0f0; } #blue { background: #00f; } </style>"
+  "<script>"
+// causes the Arduino to hang quite frequently (more often than Web_AjaxRGB.pde), probably due to the different event triggering the ajax requests
+    "$(document).ready(function(){ $('#red, #green, #blue').slider; $('#red, #green, #blue').bind( 'change', function(event, ui) { jQuery.ajaxSetup({timeout: 110}); /*not to DDoS the Arduino, you might have to change this to some threshold value that fits your setup*/ var id = $(this).attr('id'); var strength = $(this).val(); if (id == 'red') $.post('/rgb', { red: strength } ); if (id == 'green') $.post('/rgb', { green: strength } ); if (id == 'blue') $.post('/rgb', { blue: strength } ); });});"
+  "</script>"
+"</head>"
+"<body>"
+  "<div data-role=\"header\" data-position=\"inline\"><h1>Webduino RGB</h1></div>"
+    "<div class=\"ui-body ui-body-a\">"
+      "<input type=\"range\" name=\"slider\" id=\"red\" value=\"0\" min=\"0\" max=\"255\"  />"
+      "<input type=\"range\" name=\"slider\" id=\"green\" value=\"0\" min=\"0\" max=\"255\"  />"
+      "<input type=\"range\" name=\"slider\" id=\"blue\" value=\"0\" min=\"0\" max=\"255\"  />"
+    "</div>"
+  "</body>"
+"</html>";
+
+    server.printP(message);
+  }
+}
+
+void setup()
+{
+  pinMode(RED_PIN, OUTPUT);
+  pinMode(GREEN_PIN, OUTPUT);
+  pinMode(BLUE_PIN, OUTPUT);
+
+//  Serial.begin(9600);
+
+  // setup the Ehternet library to talk to the Wiznet board
+  Ethernet.begin(mac, ip);
+
+  /* register our default command (activated with the request of
+   * http://x.x.x.x/rgb */
+  webserver.setDefaultCommand(&rgbCmd);
+
+  /* start the server to wait for connections */
+  webserver.begin();
+}
+
+void loop()
+{
+  // process incoming connections one at a time forever
+  webserver.processConnection();
+//  Serial.print(red);
+//  Serial.print(" ");
+//  Serial.print(green);
+//  Serial.print(" ");
+//  Serial.println(blue);
+  analogWrite(RED_PIN, red);
+  analogWrite(GREEN_PIN, green);
+  analogWrite(BLUE_PIN, blue);
+}
diff --git a/examples/Web_Authentication/Web_Authentication.ino b/examples/Web_Authentication/Web_Authentication.ino
new file mode 100644
index 0000000..4a2384d
--- /dev/null
+++ b/examples/Web_Authentication/Web_Authentication.ino
@@ -0,0 +1,106 @@
+/* Web_Authentication.ino - Webduino Authentication example */
+
+/* This example assumes that you're familiar with the basics
+ * of the Ethernet library (particularly with setting MAC and
+ * IP addresses) and with the basics of Webduino. If you
+ * haven't had a look at the HelloWorld example you should
+ * probably check it out first */
+
+/* you can change the authentication realm by defining
+ * WEBDUINO_AUTH_REALM before including WebServer.h */
+#define WEBDUINO_AUTH_REALM "Weduino Authentication Example"
+
+#include "SPI.h"
+#include "Ethernet.h"
+#include "WebServer.h"
+
+/* CHANGE THIS TO YOUR OWN UNIQUE VALUE.  The MAC number should be
+ * different from any other devices on your network or you'll have
+ * problems receiving packets. */
+static uint8_t mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
+
+/* CHANGE THIS TO MATCH YOUR HOST NETWORK.  Most home networks are in
+ * the 192.168.0.XXX or 192.168.1.XXX subrange.  Pick an address
+ * that's not in use and isn't going to be automatically allocated by
+ * DHCP from your router. */
+static uint8_t ip[] = { 192, 168, 1, 210 };
+
+/* This creates an instance of the webserver.  By specifying a prefix
+ * of "", all pages will be at the root of the server. */
+#define PREFIX ""
+WebServer webserver(PREFIX, 80);
+
+void defaultCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  server.httpSuccess();
+  if (type != WebServer::HEAD)
+  {
+    P(helloMsg) = "<h1>Hello, World!</h1><a href=\"private.html\">Private page</a>";
+    server.printP(helloMsg);
+  }
+}
+
+void privateCmd(WebServer &server, WebServer::ConnectionType type, char *, bool)
+{
+  /* if the user has requested this page using the following credentials
+   * username = user
+   * password = user
+   * display a page saying "Hello User"
+   *
+   * the credentials have to be concatenated with a colon like
+   * username:password
+   * and encoded using Base64 - this should be done outside of your Arduino
+   * to be easy on your resources
+   *
+   * in other words: "dXNlcjp1c2Vy" is the Base64 representation of "user:user"
+   *
+   * if you need to change the username/password dynamically please search
+   * the web for a Base64 library */
+  if (server.checkCredentials("dXNlcjp1c2Vy"))
+  {
+    server.httpSuccess();
+    if (type != WebServer::HEAD)
+    {
+      P(helloMsg) = "<h1>Hello User</h1>";
+      server.printP(helloMsg);
+    }
+  }
+  /* if the user has requested this page using the following credentials
+   * username = admin
+   * password = admin
+   * display a page saying "Hello Admin"
+   *
+   * in other words: "YWRtaW46YWRtaW4=" is the Base64 representation of "admin:admin" */
+  else if (server.checkCredentials("YWRtaW46YWRtaW4="))
+  {
+    server.httpSuccess();
+    if (type != WebServer::HEAD)
+    {
+      P(helloMsg) = "<h1>Hello Admin</h1>";
+      server.printP(helloMsg);
+    }
+  }
+  else
+  {
+    /* send a 401 error back causing the web browser to prompt the user for credentials */
+    server.httpUnauthorized();
+  }
+}
+
+void setup()
+{
+  Ethernet.begin(mac, ip);
+  webserver.setDefaultCommand(&defaultCmd);
+  webserver.addCommand("index.html", &defaultCmd);
+  webserver.addCommand("private.html", &privateCmd);
+  webserver.begin();
+}
+
+void loop()
+{
+  char buff[64];
+  int len = 64;
+
+  /* process incoming connections one at a time forever */
+  webserver.processConnection(buff, &len);
+}
diff --git a/examples/Web_Buzzer/Web_Buzzer.pde b/examples/Web_Buzzer/Web_Buzzer.ino
similarity index 100%
rename from examples/Web_Buzzer/Web_Buzzer.pde
rename to examples/Web_Buzzer/Web_Buzzer.ino
diff --git a/examples/Web_Demo/Web_Demo.pde b/examples/Web_Demo/Web_Demo.ino
similarity index 100%
rename from examples/Web_Demo/Web_Demo.pde
rename to examples/Web_Demo/Web_Demo.ino
diff --git a/examples/Web_HelloWorld/Web_HelloWorld.pde b/examples/Web_HelloWorld/Web_HelloWorld.ino
similarity index 96%
rename from examples/Web_HelloWorld/Web_HelloWorld.pde
rename to examples/Web_HelloWorld/Web_HelloWorld.ino
index d523f26..aebf90a 100644
--- a/examples/Web_HelloWorld/Web_HelloWorld.pde
+++ b/examples/Web_HelloWorld/Web_HelloWorld.ino
@@ -17,8 +17,8 @@ static uint8_t mac[] = { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
 static uint8_t ip[] = { 192, 168, 1, 210 };
 
 /* This creates an instance of the webserver.  By specifying a prefix
- * of "/", all pages will be at the root of the server. */
-#define PREFIX "/"
+ * of "", all pages will be at the root of the server. */
+#define PREFIX ""
 WebServer webserver(PREFIX, 80);
 
 /* commands are functions that get called by the webserver framework
diff --git a/examples/Web_Image/Web_Image.pde b/examples/Web_Image/Web_Image.ino
similarity index 100%
rename from examples/Web_Image/Web_Image.pde
rename to examples/Web_Image/Web_Image.ino
diff --git a/examples/Web_Net_Setup/EEPROMAnything.h b/examples/Web_Net_Setup/EEPROMAnything.h
new file mode 100644
index 0000000..c548cbf
--- /dev/null
+++ b/examples/Web_Net_Setup/EEPROMAnything.h
@@ -0,0 +1,20 @@
+#include <EEPROM.h>
+#include <Arduino.h>  // for type definitions
+
+template <class T> int EEPROM_writeAnything(int ee, const T& value)
+{
+    const byte* p = (const byte*)(const void*)&value;
+    unsigned int i;
+    for (i = 0; i < sizeof(value); i++)
+          EEPROM.write(ee++, *p++);
+    return i;
+}
+
+template <class T> int EEPROM_readAnything(int ee, T& value)
+{
+    byte* p = (byte*)(void*)&value;
+    unsigned int i;
+    for (i = 0; i < sizeof(value); i++)
+          *p++ = EEPROM.read(ee++);
+    return i;
+}
diff --git a/examples/Web_Net_Setup/System.cpp b/examples/Web_Net_Setup/System.cpp
new file mode 100644
index 0000000..25ef78f
--- /dev/null
+++ b/examples/Web_Net_Setup/System.cpp
@@ -0,0 +1,59 @@
+#include "Arduino.h"
+#include "System.h"
+
+char* System::uptime()
+{
+  char buffer[65];
+
+  long days=0;
+  long hours=0;
+  long mins=0;
+  long secs=0;
+  
+  secs = millis()/1000; //convect milliseconds to seconds
+  mins=secs/60; //convert seconds to minutes
+  hours=mins/60; //convert minutes to hours
+  days=hours/24; //convert hours to days
+  secs=secs-(mins*60); //subtract the coverted seconds to minutes in order to display 59 secs max 
+  mins=mins-(hours*60); //subtract the coverted minutes to hours in order to display 59 minutes max
+  hours=hours-(days*24); //subtract the coverted hours to days in order to display 23 hours max
+
+  if (days > 0) {
+    ltoa(days,buffer,10);
+    strcpy(retval,buffer);
+  } 
+  else {
+    strcpy(retval,"0");
+  }
+
+  strcat(retval,":");
+  ltoa(hours,buffer,10);
+  strcat(retval,buffer);
+
+  strcat(retval,":");
+  ltoa(mins,buffer,10);
+  strcat(retval,buffer);
+
+  strcat(retval,":");
+  ltoa(secs,buffer,10);
+  strcat(retval,buffer);
+
+  strcat(retval,'\0');
+
+  return retval;
+}
+
+int System::ramFree () {
+  extern int __heap_start, *__brkval; 
+  int v;
+  int a = (int) &v - (__brkval == 0 ? (int) &__heap_start : (int) __brkval); 
+  return a;
+}
+
+int System::ramSize() {
+  int v;
+  int a = (int) &v;  
+  return a;
+}
+
+
diff --git a/examples/Web_Net_Setup/System.h b/examples/Web_Net_Setup/System.h
new file mode 100644
index 0000000..13397c4
--- /dev/null
+++ b/examples/Web_Net_Setup/System.h
@@ -0,0 +1,39 @@
+#ifndef System_h
+#define System_h
+
+#include <Arduino.h>
+
+/**
+* System Class.
+*
+* @author Matthias Maderer
+* @version 1.1.7
+*/
+class System {
+public:
+  /**
+  * Returns the uptime of the arduino with a char pointer.
+  * Format: DAYS:HOURS:MINUTES:SECONDS
+  * Sample: 1:20:23:50 = 1 day, 20 hours, 23 minutes and 50 seconds
+  * @return char *: pointer!
+  */
+  char * uptime();
+  
+  /**
+  * Returns the free RAM
+  * @return int: free RAM
+  */ 
+  int ramFree();
+  
+  /**
+  * Returns the size of the RAM
+  * @return int: RAM size
+  */ 
+  int ramSize();
+  
+private:
+  char retval[25];
+};
+
+#endif
+
diff --git a/examples/Web_Net_Setup/Web_Net_Setup.pde b/examples/Web_Net_Setup/Web_Net_Setup.pde
new file mode 100644
index 0000000..2425433
--- /dev/null
+++ b/examples/Web_Net_Setup/Web_Net_Setup.pde
@@ -0,0 +1,785 @@
+/* Web_Net_Setup.pde - example for a webinterface to set the network configuration 
+Author:     Matthias Maderer
+Date:       07.03.2013
+Version:    1.0.1
+web:        www.edvler-blog.de/arduino_networksetup_webinterface_with_eeprom
+
+This is a sample Sketch for Webduino!
+More informations about Webduino can be found at https://github.com/sirleech/Webduino
+
+For more informations about EEPROMAnything.h look at http://playground.arduino.cc/Code/EEPROMWriteAnything
+*/
+
+/*
+* With this example its possible to configure the network configuration of the
+* Arduino Ethernet Shield with a webinterface. Imagine like your router setup.
+* 
+* It's possible to configure the following network settings:
+* - MAC address
+* - IP address
+* - Subnet
+* - Gateway
+* - DNS Server
+* - Webserver port
+* - USE DHCP YES/NO (if you use DHCP connect per serial port - 9600 baud - on powerup to see which ip address is assigned)
+* - DHCP renew interval
+*
+* Other functions:
+* - Display DHCP renew status
+* - Display DHCP renew timestamp
+* - Display Arduino uptime
+* - Display used RAM
+* 
+* You can configure default settings. This settings are used wenn no configuration is present.
+* Look at the function set_EEPROM_Default().
+*
+* It is possible to connect a RESET button. If the button is pressed and the Arduino is turned on 
+* the default values would be restored too.
+* See #define RESET_PIN.
+*
+*
+* All settings are stored in EEPROM. This means they are permanent.
+* Please look at http://arduino.cc/en/Reference/EEPROM for a short description.
+*
+* 
+* To setup your arduino upload this sketch.
+* 
+* If you don't change the sourcecode the default IP address is http://192.168.0.111/
+* Don't forget to change the IP of your network adapter to a suitable address (e.g. to IP 192.168.0.1, NETMASK 255.255.255.0)!
+*
+* Enter the following URL for the setup page:
+* http://192.168.0.111/setupNet.html
+*
+* Please note that no input checks are done!!
+* This means that no error would be thrown if you type a wrong IP address or other failures.
+* Keep this in mind.
+*
+* Resources:
+* There are many Strings for the HTML site. The compiled size is about 27.000 Bytes. Aprox. 2000 byte of SRAM is used.
+* On smaller Arduinos this may cause problems. I've tested it on a MEGA 2560.
+*
+* BUGS:
+* - After uploading your sketch the arduino is not reachable. --> Reset your Arduino!!
+*/
+
+
+#define WEBDUINO_FAVICON_DATA "" // no favicon
+//#define DEBUG  //uncomment for serial debug output
+#define USE_SYSTEM_LIBRARY //comment out if you want to save some space (about 1 Byte). You wouldn't see uptime and free RAM if it's commented out.
+#define SERIAL_BAUD 9600
+
+
+#include "SPI.h" // new include
+#include "avr/pgmspace.h" // new include
+#include "Ethernet.h"
+#include "WebServer.h"
+
+
+/* #############################################################################################################################################################
+* Code for the EEPROM related things
+* 
+*/
+#include <EEPROM.h>
+#include "EEPROMAnything.h"
+
+#define RESET_PIN 40	//Connect a button to this PIN. If the button is hold, an the device is turned on the default ethernet settings are restored.
+
+/* structure which is stored in the eeprom. 
+* Look at "EEPROMAnything.h" for the functions storing and reading the struct
+*/
+struct config_t
+{
+    byte config_set;
+    byte use_dhcp;
+    byte dhcp_refresh_minutes;
+    byte mac[6];
+    byte ip[4];
+    byte gateway[4];
+    byte subnet[4];
+    byte dns_server[4];
+    unsigned int webserverPort;
+} eeprom_config;
+
+/** 
+* set_EEPROM_Default() function
+*
+* The default settings. 
+* This settings are used when no config is present or the reset button is pressed.
+*/
+void set_EEPROM_Default() {
+    eeprom_config.config_set=1;  // dont change! It's used to check if the config is already set
+  
+    eeprom_config.use_dhcp=0; // use DHCP per default
+    eeprom_config.dhcp_refresh_minutes=60; // refresh the DHCP every 60 minutes
+  
+    // set the default MAC address. In this case its DE:AD:BE:EF:FE:ED
+    eeprom_config.mac[0]=0xDE;  
+    eeprom_config.mac[1]=0xAD;
+    eeprom_config.mac[2]=0xBE;
+    eeprom_config.mac[3]=0xEF;
+    eeprom_config.mac[4]=0xFE;
+    eeprom_config.mac[5]=0xED;
+    
+    // set the default IP address for the arduino. In this case its 192.168.0.111
+    eeprom_config.ip[0]=192;
+    eeprom_config.ip[1]=168;
+    eeprom_config.ip[2]=0;
+    eeprom_config.ip[3]=111;
+  
+    // set the default GATEWAY. In this case its 192.168.0.254
+    eeprom_config.gateway[0]=192;
+    eeprom_config.gateway[1]=168;
+    eeprom_config.gateway[2]=0;
+    eeprom_config.gateway[3]=254;
+    
+    // set the default SUBNET. In this case its 255.255.255.0
+    eeprom_config.subnet[0]=255;
+    eeprom_config.subnet[1]=255;
+    eeprom_config.subnet[2]=255;
+    eeprom_config.subnet[3]=0;
+
+    // set the default DNS SERVER. In this case its 192.168.0.254
+    eeprom_config.dns_server[0]=192;
+    eeprom_config.dns_server[1]=168;
+    eeprom_config.dns_server[2]=0;
+    eeprom_config.dns_server[3]=254;
+
+    // set the default Webserver Port. In this case its Port 80
+    eeprom_config.webserverPort=80;
+    
+    #ifdef DEBUG
+      Serial.println("Config reset");
+    #endif 
+}
+
+
+/**
+* read_EEPROM_Settings function
+* This function is used to read the EEPROM settings at startup
+*
+* Overview:
+* - Set the PIN for the RESET-button to input and activate pullups
+* - Load the stored data from EEPROM into the eeprom_config struct
+* - Check if a config is stored or the reset button is pressed. If one of the conditions is ture, set the defaults
+*/
+void read_EEPROM_Settings() {
+  pinMode(RESET_PIN, INPUT);
+  digitalWrite(RESET_PIN, HIGH);
+  
+  // read the current config
+  EEPROM_readAnything(0, eeprom_config);
+  
+  // check if config is present or if reset button is pressed
+  if (eeprom_config.config_set != 1 || digitalRead(RESET_PIN) == LOW) {
+    // set default values
+    set_EEPROM_Default();
+    
+    // write the config to eeprom
+    EEPROM_writeAnything(0, eeprom_config);
+  } 
+}
+
+/**
+* print_EEPROM_Settings() function
+*
+* This function is used for debugging the configuration.
+* It prints the actual configuration to the serial port.
+*/
+#ifdef DEBUG
+void print_EEPROM_Settings() {
+    Serial.print("IP: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.ip[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+  
+    Serial.print("Subnet: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.subnet[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+    
+    Serial.print("Gateway: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.gateway[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+
+    Serial.print("DNS Server: ");
+    for(int i = 0; i<4; i++) {
+      Serial.print(eeprom_config.dns_server[i]);
+      if (i<3) {
+        Serial.print('.');
+      }
+    }
+    Serial.println();
+    
+    Serial.print("MAC: ");
+    for (int a=0;a<6;a++) {
+      Serial.print(eeprom_config.mac[a],HEX);
+      if(a<5) {
+        Serial.print(":");
+      }
+    }
+    Serial.println();
+    
+    Serial.print("Webserver Port: ");
+    Serial.println(eeprom_config.webserverPort);
+    
+    Serial.print("USE DHCP: ");
+    Serial.println(eeprom_config.use_dhcp);
+    
+    Serial.print(" DHCP renew every ");
+    Serial.print(eeprom_config.dhcp_refresh_minutes);
+    Serial.println(" minutes");
+    
+    Serial.print("Config Set: ");
+    Serial.println(eeprom_config.config_set);
+
+}
+#endif
+
+// #############################################################################################################################################################
+
+
+/* START Network section #######################################################################################################################################
+* Code for setting up network connection
+*/
+unsigned long last_dhcp_renew;
+byte dhcp_state;
+
+/**
+* renewDHCP() function
+* Renew the DHCP relase in a given interval.
+* 
+* Overview:
+* - Check if interval = 0 and set it to 1
+* - Check if renew interval is reached and renew the lease
+*/
+void renewDHCP(int interval) {
+  unsigned long interval_millis = interval * 60000;
+
+  if (interval == 0 ) {
+     interval = 1; 
+  }
+  if (eeprom_config.use_dhcp==1) {
+    if((millis() - last_dhcp_renew) >  interval_millis) {
+      last_dhcp_renew=millis();
+      dhcp_state = Ethernet.maintain();
+    }
+  }
+}
+
+
+/**
+* setupNetwork() function
+* This function is used to setupup the network according to the values stored in the eeprom
+*
+* Overview:
+* - First of all read the EEPROM settings
+* - Display a link to the ethernet setup
+* - Check if DHCP should be used, if not create instaces of IPAddress for ip, gateway, subnet and dns_server
+* - Invoke Ethernet.begin with all parameters if no dhcp is active (Ethernet.begin(mac, ip, dns_server, gateway, subnet);). 
+* - If DHCP is used invoke only with mac (Ethernet.begin(mac);) and display the ip on the serial console.
+*/
+void setupNetwork() {
+  read_EEPROM_Settings();
+  
+  #ifdef DEBUG
+   print_EEPROM_Settings();
+  #endif
+
+ // byte mac[] = { eeprom_config.mac[0], eeprom_config.mac[1], eeprom_config.mac[2], eeprom_config.mac[3], eeprom_config.mac[4], eeprom_config.mac[5] };  
+  
+  if (eeprom_config.use_dhcp != 1) {
+    IPAddress ip(eeprom_config.ip[0], eeprom_config.ip[1], eeprom_config.ip[2], eeprom_config.ip[3]);                                               
+    IPAddress gateway (eeprom_config.gateway[0],eeprom_config.gateway[1],eeprom_config.gateway[2],eeprom_config.gateway[3]);                      
+    IPAddress subnet  (eeprom_config.subnet[0], eeprom_config.subnet[1], eeprom_config.subnet[2], eeprom_config.subnet[3]);  
+    IPAddress dns_server  (eeprom_config.dns_server[0], eeprom_config.dns_server[1], eeprom_config.dns_server[2], eeprom_config.dns_server[3]);
+    Ethernet.begin(eeprom_config.mac, ip, dns_server, gateway, subnet);
+  } else {
+    if (Ethernet.begin(eeprom_config.mac) == 0) {
+      Serial.print("Failed to configure Ethernet using DHCP");
+    }
+    Serial.println(Ethernet.localIP());
+  }
+}
+// END Network section #########################################################################################################################################
+
+
+/* WEB-Server section #######################################################################################################################################
+* Webserver Code
+*/
+
+#ifdef USE_SYSTEM_LIBRARY
+#include "system.h"
+System sys;
+#endif
+
+/* Store all string in the FLASH storage to free SRAM.
+The P() is a function from Webduino.
+*/
+P(Page_start) = "<html><head><title>Web_EEPROM_Setup</title></head><body>\n";
+P(Page_end) = "</body></html>";
+
+P(Http400) = "HTTP 400 - BAD REQUEST";
+P(Index) = "<h1>index.html</h1><br>This is your main site!<br>The code is found in the indexHTML() function.<br>You can add more sites if you need. Please see the well documented source code.<br><br>Use the following link to setup the network.<br><a href=\"setupNet.html\">NETWORK SETUP</a>";
+
+P(Form_eth_start) = "<FORM action=\"setupNet.html\" method=\"get\">";
+P(Form_end) = "<FORM>";
+P(Form_input_send) = "<INPUT type=\"submit\" value=\"Set config\">";
+
+P(Form_input_text_start) = "<input type=\"text\" name=\"";
+P(Form_input_value)  = "\" value=\"";
+P(Form_input_size2) = "\" maxlength=\"2\" size=\"2";
+P(Form_input_size3) = "\" maxlength=\"3\" size=\"3";
+P(Form_input_end) = "\">\n";
+
+P(MAC) = "MAC address: ";
+P(IP) = "IP address: ";
+P(SUBNET) = "Subnet: ";
+P(GW) = "GW address: ";
+P(DNS_SERVER) = "DNS server: ";
+P(WEB_PORT) = "Webserver port (1-65535): ";
+P(DHCP_ACTIVE) = "Use DHCP: ";
+P(DHCP_REFRESH) = "Renew interval for DHCP in minutes (1 - 255): ";
+
+P(Form_cb) = "<input type=\"radio\" name=\"23\" value=\"";
+P(Form_cb_checked) = " checked ";
+P(Form_cb_on) = ">On";
+P(Form_cb_off) = ">Off";
+
+P(br) = "<br>\n";
+
+P(table_start) = "<table>";
+P(table_tr_start) = "<tr>";
+P(table_tr_end) = "</tr>";
+P(table_td_start) = "<td>";
+P(table_td_end) = "</td>";
+P(table_end) = "</table>";
+
+P(Config_set) = "<font size=\"6\" color=\"red\">New configuration stored! <br>Please turn off and on your Arduino or use the reset button!</font><br>";
+
+P(DHCP_STATE_TIME) = "DHCP last renew timestamp (sec)";
+P(DHCP_STATE) = "DHCP renew return code (sec)";
+
+
+P(UPTIME) = "Uptime: ";
+
+#ifdef USE_SYSTEM_LIBRARY
+P(RAM_1) = "RAM (byte): ";
+P(RAM_2) = " free of ";
+#endif
+
+/* This creates an pointer to instance of the webserver. */
+WebServer * webserver;
+
+
+/**
+* indexHTML() function
+* This function is used to send the index.html to the client.
+*/
+void indexHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
+{
+  /* this line sends the standard "we're all OK" headers back to the
+     browser */
+  server.httpSuccess();
+
+  /* if we're handling a GET or POST, we can output our data here.
+     For a HEAD request, we just stop after outputting headers. */
+  if (type == WebServer::HEAD)
+    return;
+    
+  server.printP(Page_start);
+  
+  server.printP(Index);
+  
+  server.printP(Page_end);
+    
+}
+
+/**
+* setupNetHTML() function
+* This function is used to send the setupNet.html to the client.
+*
+* Overview:
+* - Send a HTTP 200 OK Header
+* - If get parameters exists assign them to the corresponding variable in the eeprom_config struct
+* - Print the configuration
+*
+* Parameters are simple numbers. The name of the parameter is converted to an int with the atoi function.
+* This saves some code for setting the MAC and IP addresses.
+*/
+#define NAMELEN 5
+#define VALUELEN 7
+void setupNetHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
+{
+  URLPARAM_RESULT rc;
+  char name[NAMELEN];
+  char value[VALUELEN];
+  boolean params_present = false;
+  byte param_number = 0;
+
+  /* this line sends the standard "we're all OK" headers back to the
+     browser */
+  server.httpSuccess();
+
+  /* if we're handling a GET or POST, we can output our data here.
+     For a HEAD request, we just stop after outputting headers. */
+  if (type == WebServer::HEAD)
+    return;
+
+  server.printP(Page_start);
+
+  // check for parameters
+  if (strlen(url_tail)) {
+    while (strlen(url_tail)) {
+      rc = server.nextURLparam(&url_tail, name, NAMELEN, value, VALUELEN);
+      if (rc != URLPARAM_EOS) {
+        params_present=true;
+        // debug output for parameters
+        #ifdef DEBUG
+        Serial.print(name);
+        server.print(name);
+        Serial.print(" - "); 
+        server.print(" - ");
+        Serial.println(value);
+        server.print(value);
+        server.print("<br>");
+        #endif
+        
+        
+        param_number = atoi(name);
+ 
+        // read MAC address
+        if (param_number >=0 && param_number <=5) {
+          eeprom_config.mac[param_number]=strtol(value,NULL,16);
+        }
+    
+        // read IP address
+        if (param_number >=6 && param_number <=9) {
+          eeprom_config.ip[param_number-6]=atoi(value);
+        }
+    
+        // read SUBNET
+        if (param_number >=10 && param_number <=13) {
+          eeprom_config.subnet[param_number-10]=atoi(value);
+        }
+    
+        // read GATEWAY
+        if (param_number >=14 && param_number <=17) {
+          eeprom_config.gateway[param_number-14]=atoi(value);
+        }
+    
+        // read DNS-SERVER
+        if (param_number >=18 && param_number <=21) {
+          eeprom_config.dns_server[param_number-18]=atoi(value);
+        }
+        
+        // read WEBServer port
+        if (param_number == 22) {
+          eeprom_config.webserverPort=atoi(value);
+        }
+        
+        // read DHCP ON/OFF
+        if (param_number == 23) {
+          eeprom_config.use_dhcp=atoi(value);
+        }
+    
+        // read DHCP renew interval
+        if (param_number == 24) {
+          eeprom_config.dhcp_refresh_minutes=atoi(value);
+        } 
+      }
+    }
+    EEPROM_writeAnything(0, eeprom_config);
+  }
+
+  //print the form
+  server.printP(Form_eth_start);
+  
+  if(params_present==true) {
+     server.printP(Config_set);
+  }
+    
+  server.printP(table_start);
+  
+  // print the current MAC
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(MAC);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  for (int a=0;a<6;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.mac[a],HEX);
+    server.printP(Form_input_size2);    
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  // print the current IP
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(IP);
+  server.printP(table_td_end);
+  server.printP(table_td_start);    
+  for (int a=0;a<4;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a+6);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.ip[a]);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+  
+
+  // print the current SUBNET
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(SUBNET);
+  server.printP(table_td_end);
+  server.printP(table_td_start); 
+  for (int a=0;a<4;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a+10);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.subnet[a]);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  // print the current GATEWAY
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(GW);
+  server.printP(table_td_end);
+  server.printP(table_td_start); 
+  for (int a=0;a<4;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a+14);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.gateway[a]);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  // print the current DNS-SERVER
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(DNS_SERVER);
+  server.printP(table_td_end);
+  server.printP(table_td_start); 
+  for (int a=0;a<4;a++) {
+    server.printP(Form_input_text_start);
+    server.print(a+18);
+    server.printP(Form_input_value);
+    server.print(eeprom_config.dns_server[a]);
+    server.printP(Form_input_size3);
+    server.printP(Form_input_end);
+  }
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  
+  // print the current webserver port
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(WEB_PORT);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.printP(Form_input_text_start);
+  server.print(22);
+  server.printP(Form_input_value);
+  server.print(eeprom_config.webserverPort);
+  server.printP(Form_input_end);
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+  
+  //print the current DHCP config
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(DHCP_ACTIVE);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.printP(Form_cb);
+  server.print("0\"");
+   if(eeprom_config.use_dhcp != 1) {
+    server.printP(Form_cb_checked);
+  }
+  server.printP(Form_cb_off);   
+  
+  server.printP(Form_cb);
+  server.print("1\"");
+  if(eeprom_config.use_dhcp == 1) {
+    server.printP(Form_cb_checked);
+  }
+  server.printP(Form_cb_on);   
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+  
+  //print the current DHCP renew time
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(DHCP_REFRESH);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.printP(Form_input_text_start);
+  server.print(24);
+  server.printP(Form_input_value);
+  server.print(eeprom_config.dhcp_refresh_minutes);
+  server.printP(Form_input_size3);
+  server.printP(Form_input_end);
+  server.printP(table_td_end);
+  server.printP(table_tr_end);
+
+  //print DHCP status
+  if(eeprom_config.use_dhcp == 1) {
+    server.printP(table_tr_start);
+    server.printP(table_td_start);	
+    server.printP(DHCP_STATE);
+    server.printP(table_td_end);
+    server.printP(table_td_start);
+    server.print(dhcp_state);
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+	 
+    server.printP(table_tr_start);
+    server.printP(table_td_start);	
+    server.printP(DHCP_STATE_TIME);
+    server.printP(table_td_end);
+    server.printP(table_td_start);
+    server.print(last_dhcp_renew/1000);
+    server.printP(table_td_end);
+    server.printP(table_tr_end);
+  }
+  
+  #ifdef USE_SYSTEM_LIBRARY
+  //print uptime
+  server.printP(table_tr_start);
+  server.printP(table_td_start);	
+  server.printP(UPTIME);
+  server.printP(table_td_end);
+  server.printP(table_td_start);
+  server.print(sys.uptime());
+  server.printP(table_td_end);
+  server.printP(table_tr_end); 
+
+  server.printP(table_tr_start);
+  server.printP(table_td_start);
+  server.printP(RAM_1);	
+  server.print(sys.ramFree());
+  server.printP(RAM_2);
+  server.print(sys.ramSize());
+  server.printP(table_td_end);
+  server.printP(table_tr_end); 
+  #endif
+  
+  server.printP(table_end);
+  
+  //print the send button
+  server.printP(Form_input_send);    
+  server.printP(Form_end);
+  
+
+  
+  server.printP(Page_end);
+
+}
+
+/**
+* errorHTML() function
+* This function is called whenever a non extisting page is called.
+* It sends a HTTP 400 Bad Request header and the same as text.
+*/
+void errorHTML(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
+{
+  /* this line sends the standard "HTTP 400 Bad Request" headers back to the
+     browser */
+  server.httpFail();
+
+  /* if we're handling a GET or POST, we can output our data here.
+     For a HEAD request, we just stop after outputting headers. */
+  if (type == WebServer::HEAD)
+    return;
+    
+  server.printP(Http400);
+  
+  server.printP(Page_end);
+}
+
+// END WEBCODE ######################################################################################################################################################
+
+/**
+* setup() function
+* This function is called whenever the arduino is turned on.
+*/
+void setup()
+{
+  Serial.begin(SERIAL_BAUD);
+  
+  /* initialize the Ethernet adapter with the settings from eeprom */
+  delay(200); // some time to settle
+  setupNetwork();
+  delay(200); // some time to settle
+  
+  #define PREFIX ""
+  webserver = new WebServer(PREFIX, eeprom_config.webserverPort);
+
+  /* setup our default command that will be run when the user accesses
+   * the root page on the server */
+  webserver->setDefaultCommand(&indexHTML);
+
+  /* setup our default command that will be run when the user accesses
+   * a page NOT on the server */
+  webserver->setFailureCommand(&errorHTML);
+
+  /* run the same command if you try to load /index.html, a common
+   * default page name */
+  webserver->addCommand("index.html", &indexHTML);
+
+  /* display a network setup form. The configuration is stored in eeprom */
+  webserver->addCommand("setupNet.html", &setupNetHTML);
+
+  /* start the webserver */
+  webserver->begin();
+}
+
+/**
+* loop() function
+* Runs forver ....
+* 
+* Overview:
+* - Renew the DHCP lease
+* - Serve web clients
+*
+*/
+void loop()
+{
+  // renew DHCP lease
+  renewDHCP(eeprom_config.dhcp_refresh_minutes);
+
+  char buff[200];
+  int len = 200;
+
+  /* process incoming connections one at a time forever */
+  webserver->processConnection(buff, &len);
+}
diff --git a/examples/Web_Parms/Web_Parms.pde b/examples/Web_Parms/Web_Parms.ino
similarity index 97%
rename from examples/Web_Parms/Web_Parms.pde
rename to examples/Web_Parms/Web_Parms.ino
index 3b7454e..504bc81 100644
--- a/examples/Web_Parms/Web_Parms.pde
+++ b/examples/Web_Parms/Web_Parms.ino
@@ -154,9 +154,7 @@ void parsedCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail
 {
   URLPARAM_RESULT rc;
   char name[NAMELEN];
-  int  name_len;
   char value[VALUELEN];
-  int value_len;
 
   /* this line sends the standard "we're all OK" headers back to the
      browser */
@@ -205,7 +203,7 @@ void parsedCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail
   if (type == WebServer::POST)
   {
     server.printP(Post_params_begin);
-    while (server.nextURLparam(&url_tail, name, NAMELEN, value, VALUELEN))
+    while (server.readPOSTparam(name, NAMELEN, value, VALUELEN))
     {
       server.print(name);
       server.printP(Parsed_item_separator);
@@ -219,7 +217,7 @@ void parsedCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail
 
 void my_failCmd(WebServer &server, WebServer::ConnectionType type, char *url_tail, bool tail_complete)
 {
-  /* this line sends the standard "we're all OK" headers back to the
+  /* this line sends the "HTTP 400 - Bad Request" headers back to the
      browser */
   server.httpFail();
 
diff --git a/keywords.txt b/keywords.txt
new file mode 100644
index 0000000..f72c5a9
--- /dev/null
+++ b/keywords.txt
@@ -0,0 +1,34 @@
+WebServer	KEYWORD1
+ConnectionType	KEYWORD1
+INVALID	KEYWORD2
+GET	KEYWORD2
+HEAD	KEYWORD2
+POST	KEYWORD2
+PUT	KEYWORD2
+DELETE	KEYWORD2
+PATCH	KEYWORD2
+begin	KEYWORD2
+processConnection	KEYWORD2
+setDefaultCommand	KEYWORD2
+setFailureCommand	KEYWORD2
+addCommand	KEYWORD2
+printCRLF	KEYWORD2
+printP	KEYWORD2
+writeP	KEYWORD2
+radioButton	KEYWORD2
+checkBox	KEYWORD2
+read	KEYWORD2
+push	KEYWORD2
+expect	KEYWORD2
+readInt	KEYWORD2
+readHeader	KEYWORD2
+readPOSTparam	KEYWORD2
+nextURLparam	KEYWORD2
+checkCredentials	KEYWORD2
+httpFail	KEYWORD2
+httpUnauthorized	KEYWORD2
+httpServerError	KEYWORD2
+httpSuccess	KEYWORD2
+httpSeeOther	KEYWORD2
+write	KEYWORD2
+P	KEYWORD2
diff --git a/readme.md b/readme.md
index 934ff43..e312bc1 100644
--- a/readme.md
+++ b/readme.md
@@ -1,38 +1,105 @@
 # Webduino
-### Project forked from 1.4.1 of http://code.google.com/p/webduino/ By Ben Combee
 
-This is an Arduino-based Web Server library, originally developed for a class at NYC Resistor. It's called Webduino, and it's an extensible web server library for the Arduino using the Wiznet-based Ethernet shields. It's released under the MIT license allowing all sorts of reuse. 
+This is an Arduino-based Web Server library, originally developed for a class at NYC Resistor. It's called Webduino, and it's an extensible web server library for the Arduino using the Wiznet-based Ethernet shields. It's released under the MIT license allowing all sorts of reuse.
 
-I've got a few examples up right now -- the Buzz example interfaces with Zach's Danger Shield allowing you to remotely start and stop the speaker. We had a room full of students pinging my Arduino board on Saturday, buzzing me while I was lecturing. It was fun. The big Demo example shows how to setup an HTML form running on the device where you can read and write pins.
+## Features
 
-I hope to add a few more examples in the next few weeks, including a web-enabled fridge sign using a serial LCD and how to serve things other than just HTML text from the device. I also need to work on more documentation and finishing up my slides.
-
-### Features
 - URL parameter parsing
-- Handle HTTP Methods, e.g. GET, POST
+- Handle the following HTTP Methods: GET, HEAD, POST, PUT, DELETE, PATCH
 - Web Forms
 - Images
 - JSON/RESTful interface
+- HTTP Basic Authentication
 
-### Installation Notes
+## Installation Notes
 
-With Arduino 0022, add the Webduino folder to the "libraries" folder of your sketchbook directory. 
+With Arduino 1.0, add the Webduino folder to the "libraries" folder of your sketchbook directory.
 
 You can put the examples in your own sketchbook directory, or in hardware/libraries/webduino/examples, as you prefer.
 
 If you get an error message when building the examples similar to "WebServer.h not found", it's a problem with where you put the Webduino folder. The server won't work if the header is directly in the libraries folder.
 
+## Resources
+
+- [Wedbuino Presentation on Google Docs](http://docs.google.com/present/view?id=dd8gqxt8_5c8w9qfg3)
+- [A Wedbuino based file server](http://playground.arduino.cc//Main/WebduinoFileServer)
 
-### Presentation
-[Wedbuino Presentation on Google Docs](http://docs.google.com/present/view?id=dd8gqxt8_5c8w9qfg3)
 
-### Compatible Ethernet Shields
+## Compatible Ethernet Shields
+
 These have all been tested with the library successfully:
 
-- Freetronics Etherten
-- Freetronics Ethernet Shield
-- Arduino Ethernet Shield, both original and updated microSD version
-- Adafruit Ethernet Shield w/ Wiznet 811MJ module
-- NKC Electronics Ethernet Shield DIY Kit
+- [Freetronics Etherten](http://www.freetronics.com/products/etherten)
+- [Freetronics Ethernet Shield](http://www.freetronics.com/products/ethernet-shield-with-poe)
+- [Arduino Ethernet](http://arduino.cc/en/Main/ArduinoBoardEthernet)
+- [Arduino Ethernet Shield, both original and updated microSD version](http://arduino.cc/en/Main/ArduinoEthernetShield)
+- [Adafruit Ethernet Shield w/ Wiznet 811MJ module](http://www.ladyada.net/make/eshield/)
+- [NKC Electronics Ethernet Shield DIY Kit](http://store.nkcelectronics.com/nkc-ethernet-shield-diy-kit-without-wiz812mj-mod812.html)
+
+Shields using the Microchip ENC28J60 chip won't work with the library as that requires more software support for implementating 
+the TCP/IP stack.
+
+## Version history
+
+### 1.7 released in Jan 2012
+
+- fixed Google Code issue [4](http://code.google.com/p/webduino/issues/detail?id=4) where expect fails with high-ASCII characters due to sign issues
+- fixed Google Code issue [8](http://code.google.com/p/webduino/issues/detail?id=8) by adding WEBDUINO_NO_IMPLEMENTATION macro that allows including the class definition without the implementation code
+- fixed Google Code issue [9](http://code.google.com/p/webduino/issues/detail?id=9): allowing prog_char* strings for printP
+- added httpServerError() method to output 500 Internal Server Error message
+- added support for HTTP PUT, DELETE, and PATCH methods (see Google Code issue [11](http://code.google.com/p/webduino/issues/detail?id=11)
+- fixed Google Code issue [12](http://code.google.com/p/webduino/issues/detail?id=12): off-by-one error in name/value parser (readPOSTparam) where the buffer wouldn't ever be completely filled
+- updated copyright string for 2012 and major authors
+- GitHub fork now the official version; all open issues on Google Code site fixed or closed and moved to GitHub
+
+### 1.6 released in Jan 2012
+
+- added [checkCredentials](http://ten-fingers-and-a-brain.com/arduino-projects/webduino/checkcredentials/) and [httpUnauthorized](http://ten-fingers-and-a-brain.com/arduino-projects/webduino/httpunauthorized/) methods as well as readHeader method for HTTP Basic Authentication; currently users will have to do the Base64 encoding outside of Webduino and I'm uncertain whether I ever want this inside the library or not...
+- fixed the request parser: previously the command dispatcher would always pass true for tail_complete, even if the tail was incomplete
+- fixed the command dispatcher: previously the default command could not have a tail, but the EPIC FAIL was returned
+
+### 1.5 released in Dec 2011
+
+- added a default favicon.ico based on the led.png from the Image example to save resources on Firefox trying to load this file on every request if it can't be loaded
+- added keywords.txt for syntax highlighting in Arduino IDE
+- bumped the version number up in response headers and compiler variables
+- added version history to readme
+- fixed default value for prefix
+- fixed /index.html in Hello World example
+
+### releases between Jul 2011 and Dec 2011
+
+- project forked on GitHub by Chris Lee
+- JSON/RESTful interface
+- header Access-Control-Allow-Origin added
+- code split in .h and .cpp files
+- Arduino 1.0 changes by Dave Falkenburg and others
+- adding CRLF after extraHeaders
+
+### 1.4.1 released in Nov 2009
+
+- fix examples to use readPOSTparam method
+
+### 1.4 released in Sep 2009
+
+- bug fix for multple connections
+
+### 1.3.1 released in Aug 2009
+
+- major bug fix for 1.3 for posts where Content-Length is last header sent
+
+### 1.3 released in Aug 2009
+
+- mostly robustness fixes (beta)
+
+### 1.2.1 released in Aug 2009
+
+- fixed HelloWorld example
+
+### 1.2 released in Jul 2009
+
+- now with GET parameter handling
 
+### 1.1 released in Apr 2009
 
+### 1.0 released in Mar 2009