diff --git a/test_websocket.py b/test_websocket.py
index 55fa88f..4e03f79 100644
--- a/test_websocket.py
+++ b/test_websocket.py
@@ -96,6 +96,12 @@ class WebSocketTest(unittest.TestCase):
         self.assertEquals(p[2], "/r")
         self.assertEquals(p[3], True)
 
+        p = ws._parse_url("wss://www.example.com:8080/r?key=value")
+        self.assertEquals(p[0], "www.example.com")
+        self.assertEquals(p[1], 8080)
+        self.assertEquals(p[2], "/r?key=value")
+        self.assertEquals(p[3], True)
+
         self.assertRaises(ValueError, ws._parse_url, "http://www.example.com/r")
 
     def testWSKey(self):
diff --git a/websocket.py b/websocket.py
index a4bc993..6be5cfb 100644
--- a/websocket.py
+++ b/websocket.py
@@ -132,6 +132,9 @@ def _parse_url(url):
     else:
         resource = "/"
 
+    if parsed.query:
+        resource += "?" + parsed.query
+
     return (hostname, port, resource, is_secure)
 
 def create_connection(url, timeout=None, **options):