diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index 15bb6d4..0daba92 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -46,9 +46,9 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
     public private(set) var probing = false
     public private(set) var session: NSURLSession?
     public private(set) var sid = ""
-    public private(set) var socketPath = "/engine.io"
+    public private(set) var socketPath = "/engine.io/"
     public private(set) var urlPolling = ""
-    public private(set) var urlWebSocket = ""
+    public private(set) var urlWebSocket = NSURL()
     public private(set) var websocket = false
     public private(set) var ws: WebSocket?
 
@@ -199,9 +199,9 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
         }
     }
 
-    private func createURLs(params: [String: AnyObject]?) -> (String, String) {
+    private func createURLs(params: [String: AnyObject]?) -> (String, NSURL) {
         if client == nil {
-            return ("", "")
+            return ("", NSURL())
         }
 
         let absURL = url.absoluteString["https?://"] <~ ""
@@ -215,14 +215,17 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
         
         let socketURL = "\(baseURL)\(socketPath)/?transport="
         var urlPolling: String
-        var urlWebSocket: String
+        var queryString = "transport=websocket"
+        let urlWebSocket = NSURLComponents(string: url.absoluteString)!
+        
+        urlWebSocket.path = socketPath
 
         if secure {
             urlPolling = "https://" + socketURL + "polling"
-            urlWebSocket = "wss://" + socketURL + "websocket"
+            urlWebSocket.scheme = "wss"
         } else {
             urlPolling = "http://" + socketURL + "polling"
-            urlWebSocket = "ws://" + socketURL + "websocket"
+            urlWebSocket.scheme = "ws"
         }
 
         if params != nil {
@@ -230,27 +233,29 @@ public final class SocketEngine: NSObject, SocketEnginePollable, SocketEngineWeb
                 let keyEsc = key.stringByAddingPercentEncodingWithAllowedCharacters(
                     allowedCharacterSet)!
                 urlPolling += "&\(keyEsc)="
-                urlWebSocket += "&\(keyEsc)="
+                queryString += "&\(keyEsc)="
 
                 if value is String {
                     let valueEsc = (value as! String).stringByAddingPercentEncodingWithAllowedCharacters(
                         allowedCharacterSet)!
-                    urlPolling += "\(valueEsc)"
-                    urlWebSocket += "\(valueEsc)"
+                    urlPolling += String(valueEsc)
+                    queryString += String(value)
                 } else {
-                    urlPolling += "\(value)"
-                    urlWebSocket += "\(value)"
+                    urlPolling += String(value)
+                    queryString += String(value)
                 }
             }
         }
 
-        return (urlPolling, urlWebSocket)
+        urlWebSocket.query = queryString
+        return (urlPolling, urlWebSocket.URL!)
     }
 
     private func createWebsocketAndConnect() {
-        let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)")
-
-        ws = WebSocket(url: NSURL(string: wsUrl)!)
+        let component = NSURLComponents(URL: urlWebSocket, resolvingAgainstBaseURL: false)!
+        component.query = component.query! + (sid == "" ? "" : "&sid=\(sid)")
+        
+        ws = WebSocket(url: component.URL!)
         
         if cookies != nil {
             let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!)
diff --git a/Source/SocketEngineSpec.swift b/Source/SocketEngineSpec.swift
index 64cd6e1..afa84f5 100644
--- a/Source/SocketEngineSpec.swift
+++ b/Source/SocketEngineSpec.swift
@@ -43,7 +43,7 @@ import Foundation
     var sid: String { get }
     var socketPath: String { get }
     var urlPolling: String { get }
-    var urlWebSocket: String { get }
+    var urlWebSocket: NSURL { get }
     var websocket: Bool { get }
     
     init(client: SocketEngineClient, url: NSURL, options: NSDictionary?)
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index 218c8ca..11c7ea1 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -92,7 +92,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
             }
         }
         
-        self.options.insertIgnore(.Path("/socket.io"))
+        self.options.insertIgnore(.Path("/socket.io/"))
         
         super.init()
     }