diff --git a/websocket-sharp/Server/WebSocketBehavior.cs b/websocket-sharp/Server/WebSocketBehavior.cs
index ca94017f..b5e8ffeb 100644
--- a/websocket-sharp/Server/WebSocketBehavior.cs
+++ b/websocket-sharp/Server/WebSocketBehavior.cs
@@ -108,6 +108,27 @@ namespace WebSocketSharp.Server
       }
     }
 
+    /// <summary>
+    /// Gets the query string included in a WebSocket handshake request.
+    /// </summary>
+    /// <value>
+    ///   <para>
+    ///   A <see cref="NameValueCollection"/> that contains the query
+    ///   parameters.
+    ///   </para>
+    ///   <para>
+    ///   An empty collection if not included.
+    ///   </para>
+    ///   <para>
+    ///   <see langword="null"/> if the session has not started yet.
+    ///   </para>
+    /// </value>
+    protected NameValueCollection QueryString {
+      get {
+        return _context != null ? _context.QueryString : null;
+      }
+    }
+
     /// <summary>
     /// Gets the management function for the sessions in the service.
     /// </summary>