diff --git a/libraries/embedded-webserver/src/HTTPConnection.cpp b/libraries/embedded-webserver/src/HTTPConnection.cpp
index 3ffc96c9f4..50ce72e0cd 100755
--- a/libraries/embedded-webserver/src/HTTPConnection.cpp
+++ b/libraries/embedded-webserver/src/HTTPConnection.cpp
@@ -15,8 +15,10 @@
 #include "HTTPManager.h"
 
 const char* HTTPConnection::StatusCode200 = "200 OK";
+const char* HTTPConnection::StatusCode301 = "301 Moved Permanently";
 const char* HTTPConnection::StatusCode400 = "400 Bad Request";
 const char* HTTPConnection::StatusCode404 = "404 Not Found";
+const char* HTTPConnection::DefaultContentType = "text/plain; charset=ISO-8859-1";
 
 HTTPConnection::HTTPConnection (QTcpSocket* socket, HTTPManager* parentManager) :
     QObject(parentManager),
diff --git a/libraries/embedded-webserver/src/HTTPConnection.h b/libraries/embedded-webserver/src/HTTPConnection.h
index 9342c32849..dbf1e31f47 100644
--- a/libraries/embedded-webserver/src/HTTPConnection.h
+++ b/libraries/embedded-webserver/src/HTTPConnection.h
@@ -40,8 +40,10 @@ class HTTPConnection : public QObject {
 
 public:
     static const char* StatusCode200;
+    static const char* StatusCode301;
     static const char* StatusCode400;
     static const char* StatusCode404;
+    static const char* DefaultContentType;
 
     /// WebSocket close status codes.
     enum ReasonCode { NoReason = 0, NormalClosure = 1000, GoingAway = 1001 };
@@ -72,7 +74,7 @@ public:
 
     /// Sends a response and closes the connection.
     void respond (const char* code, const QByteArray& content = QByteArray(),
-        const char* contentType = "text/plain; charset=ISO-8859-1",
+        const char* contentType = DefaultContentType,
         const Headers& headers = Headers());
 
 protected slots:
diff --git a/libraries/embedded-webserver/src/HTTPManager.cpp b/libraries/embedded-webserver/src/HTTPManager.cpp
index 735300de7c..849bf593cd 100755
--- a/libraries/embedded-webserver/src/HTTPManager.cpp
+++ b/libraries/embedded-webserver/src/HTTPManager.cpp
@@ -23,7 +23,6 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QString& p
     }
     
     // check to see if there is a file to serve from the document root for this path
-    
     QString subPath = path;
     
     // remove any slash at the beginning of the path
@@ -33,6 +32,19 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QString& p
     
     QString filePath;
     
+    if (QFileInfo(_documentRoot + subPath).isFile()) {
+        filePath = _documentRoot + subPath;
+    } else if (subPath.size() > 0 && !subPath.endsWith('/')) {
+        // this could be a directory with a trailing slash
+        // send a redirect to the path with a slash so we can
+        QString redirectLocation = '/' + subPath + '/';
+        
+        QHash<QByteArray, QByteArray> redirectHeader;
+        redirectHeader.insert(QByteArray("Location"), redirectLocation.toUtf8());
+        
+        connection->respond(HTTPConnection::StatusCode301, "", HTTPConnection::DefaultContentType, redirectHeader);
+    }
+    
     // if the last thing is a trailing slash then we want to look for index file
     if (subPath.endsWith('/') || subPath.size() == 0) {
         QStringList possibleIndexFiles = QStringList() << "index.html" << "index.shtml";
@@ -43,14 +55,10 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QString& p
                 break;
             }
         }
-    } else if (QFileInfo(_documentRoot + subPath).isFile()) {
-        filePath = _documentRoot + subPath;
     }
-
     
     if (!filePath.isEmpty()) {
         // file exists, serve it
-
         static QMimeDatabase mimeDatabase;
         
         QFile localFile(filePath);
@@ -99,8 +107,10 @@ bool HTTPManager::handleHTTPRequest(HTTPConnection* connection, const QString& p
             }
         }
         
-        connection->respond(HTTPConnection::StatusCode200, localFileString.toLocal8Bit(), qPrintable(mimeDatabase.mimeTypeForFile(filePath).name()));
+        connection->respond(HTTPConnection::StatusCode200, localFileString.toLocal8Bit(),
+                            qPrintable(mimeDatabase.mimeTypeForFile(filePath).name()));
     } else {
+        
         // respond with a 404
         connection->respond(HTTPConnection::StatusCode404, "Resource not found.");
     }