                 filePath += "/" + url
             }
         }
-        
-        filePath = "." + filePath
-        
+
         if filePath.hasSuffix("/") {
             if serveIndexForDir {
                 filePath += "index.html"

// MARK: StaticFileServer

public class StaticFileServer : RouterMiddleware {
    
    //
    // If a file is not found, the given extensions will be added to the file name and searched for. The first that exists will be served. Example: ['html', 'htm'].
    //
    private var possibleExtensions : [String]?
    
    //
    // Serve "index.html" files in response to a request on a directory.  Defaults to true.
    //
    private var serveIndexForDir = true
    
    //
    // Uses the file system's last modified value.  Defaults to true.
    //
    private var addLastModifiedHeader = true
    
    //
    // Value of max-age in Cache-Control header.  Defaults to 0.
    //
    private var maxAgeCacheControlHeader = 0
    
    //
    // Redirect to trailing "/" when the pathname is a dir. Defaults to true.
    //
    private var redirect = true
    
    //
    // A setter for custom response headers.
    //
    private var customResponseHeadersSetter : ResponseHeadersSetter?
    
    //
    // Generate ETag. Defaults to true.
    //
    private var generateETag = true
    
    
    
    private var path : String
    
    public convenience init (options: [Options]) {
        self.init(path: "/public", options: options)
    }
    
    public convenience init () {
        self.init(path: "/public", options: nil)
    }
    
    ///
    /// Initializes a StaticFileServer instance
    ///

        else {
            self.path = path
        }
        // If we received a path with a tlde (~) in the front, expand it.
        self.path = self.path.bridge().stringByExpandingTildeInPath

        if let options = options {
            for option in options {
                switch option {
