diff --git a/Example/Example.pidb b/Example/Example.pidb
index 91b3ae1b..5ad31e7d 100644
Binary files a/Example/Example.pidb and b/Example/Example.pidb differ
diff --git a/Example/bin/Debug/example.exe b/Example/bin/Debug/example.exe
index 7b990bc6..d6540a1c 100755
Binary files a/Example/bin/Debug/example.exe and b/Example/bin/Debug/example.exe differ
diff --git a/Example/bin/Debug/example.exe.mdb b/Example/bin/Debug/example.exe.mdb
index d1790e2d..cc8a5b45 100644
Binary files a/Example/bin/Debug/example.exe.mdb and b/Example/bin/Debug/example.exe.mdb differ
diff --git a/Example/bin/Debug/websocket-sharp.dll b/Example/bin/Debug/websocket-sharp.dll
index 18aa4731..2234c67b 100755
Binary files a/Example/bin/Debug/websocket-sharp.dll and b/Example/bin/Debug/websocket-sharp.dll differ
diff --git a/Example/bin/Debug/websocket-sharp.dll.mdb b/Example/bin/Debug/websocket-sharp.dll.mdb
index e6ebba4f..5104efe3 100644
Binary files a/Example/bin/Debug/websocket-sharp.dll.mdb and b/Example/bin/Debug/websocket-sharp.dll.mdb differ
diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe
index 2985dda5..db58ae88 100755
Binary files a/Example/bin/Debug_Ubuntu/example.exe and b/Example/bin/Debug_Ubuntu/example.exe differ
diff --git a/Example/bin/Debug_Ubuntu/example.exe.mdb b/Example/bin/Debug_Ubuntu/example.exe.mdb
index 6de87e18..f2f8ffd4 100644
Binary files a/Example/bin/Debug_Ubuntu/example.exe.mdb and b/Example/bin/Debug_Ubuntu/example.exe.mdb differ
diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll b/Example/bin/Debug_Ubuntu/websocket-sharp.dll
index 1479b294..263f150d 100755
Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll differ
diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
index 2573ad40..064f6637 100644
Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ
diff --git a/Example/bin/Release/example.exe b/Example/bin/Release/example.exe
index 6309273f..aebf0ae3 100755
Binary files a/Example/bin/Release/example.exe and b/Example/bin/Release/example.exe differ
diff --git a/Example/bin/Release/websocket-sharp.dll b/Example/bin/Release/websocket-sharp.dll
index 334ea401..9e8af838 100755
Binary files a/Example/bin/Release/websocket-sharp.dll and b/Example/bin/Release/websocket-sharp.dll differ
diff --git a/Example/bin/Release_Ubuntu/example.exe b/Example/bin/Release_Ubuntu/example.exe
index 9449435b..c1c22726 100755
Binary files a/Example/bin/Release_Ubuntu/example.exe and b/Example/bin/Release_Ubuntu/example.exe differ
diff --git a/Example/bin/Release_Ubuntu/websocket-sharp.dll b/Example/bin/Release_Ubuntu/websocket-sharp.dll
index 22462df0..bdcc677b 100755
Binary files a/Example/bin/Release_Ubuntu/websocket-sharp.dll and b/Example/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/Example1/bin/Debug/example1.exe b/Example1/bin/Debug/example1.exe
index 4176291b..17b81b6e 100755
Binary files a/Example1/bin/Debug/example1.exe and b/Example1/bin/Debug/example1.exe differ
diff --git a/Example1/bin/Debug/example1.exe.mdb b/Example1/bin/Debug/example1.exe.mdb
index 8ef32166..44b68338 100644
Binary files a/Example1/bin/Debug/example1.exe.mdb and b/Example1/bin/Debug/example1.exe.mdb differ
diff --git a/Example1/bin/Debug/websocket-sharp.dll b/Example1/bin/Debug/websocket-sharp.dll
index 18aa4731..2234c67b 100755
Binary files a/Example1/bin/Debug/websocket-sharp.dll and b/Example1/bin/Debug/websocket-sharp.dll differ
diff --git a/Example1/bin/Debug/websocket-sharp.dll.mdb b/Example1/bin/Debug/websocket-sharp.dll.mdb
index e6ebba4f..5104efe3 100644
Binary files a/Example1/bin/Debug/websocket-sharp.dll.mdb and b/Example1/bin/Debug/websocket-sharp.dll.mdb differ
diff --git a/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe
index 2ab2bafa..ea743608 100755
Binary files a/Example1/bin/Debug_Ubuntu/example1.exe and b/Example1/bin/Debug_Ubuntu/example1.exe differ
diff --git a/Example1/bin/Debug_Ubuntu/example1.exe.mdb b/Example1/bin/Debug_Ubuntu/example1.exe.mdb
index 2b36da31..fdffbc97 100644
Binary files a/Example1/bin/Debug_Ubuntu/example1.exe.mdb and b/Example1/bin/Debug_Ubuntu/example1.exe.mdb differ
diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll
index 1479b294..263f150d 100755
Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll differ
diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
index 2573ad40..064f6637 100644
Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ
diff --git a/Example1/bin/Release/example1.exe b/Example1/bin/Release/example1.exe
index 72091fdd..8b285932 100755
Binary files a/Example1/bin/Release/example1.exe and b/Example1/bin/Release/example1.exe differ
diff --git a/Example1/bin/Release/websocket-sharp.dll b/Example1/bin/Release/websocket-sharp.dll
index 334ea401..9e8af838 100755
Binary files a/Example1/bin/Release/websocket-sharp.dll and b/Example1/bin/Release/websocket-sharp.dll differ
diff --git a/Example1/bin/Release_Ubuntu/example1.exe b/Example1/bin/Release_Ubuntu/example1.exe
index e5f9b390..8be6d9ba 100755
Binary files a/Example1/bin/Release_Ubuntu/example1.exe and b/Example1/bin/Release_Ubuntu/example1.exe differ
diff --git a/Example1/bin/Release_Ubuntu/websocket-sharp.dll b/Example1/bin/Release_Ubuntu/websocket-sharp.dll
index 22462df0..bdcc677b 100755
Binary files a/Example1/bin/Release_Ubuntu/websocket-sharp.dll and b/Example1/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/Example2/Chat.cs b/Example2/Chat.cs
index fb0c13ca..5fd3c229 100644
--- a/Example2/Chat.cs
+++ b/Example2/Chat.cs
@@ -23,22 +23,22 @@ namespace Example2 {
       return Interlocked.Increment(ref _num);
     }
 
-    protected override void OnOpen(object sender, EventArgs e)
+    protected override void OnOpen()
     {
       _name = getName();
     }
 
-    protected override void OnMessage(object sender, MessageEventArgs e)
+    protected override void OnMessage(MessageEventArgs e)
     {
       
       var msg = String.Format("{0}: {1}", _name, e.Data);
-      Publish(msg);
+      Broadcast(msg);
     }
 
-    protected override void OnClose(object sender, CloseEventArgs e)
+    protected override void OnClose(CloseEventArgs e)
     {
       var msg = String.Format("{0} got logged off...", _name);
-      Publish(msg);
+      Broadcast(msg);
     }
   }
 }
diff --git a/Example2/Echo.cs b/Example2/Echo.cs
index 8d87c2d5..831e125b 100644
--- a/Example2/Echo.cs
+++ b/Example2/Echo.cs
@@ -6,7 +6,7 @@ namespace Example2 {
 
   public class Echo : WebSocketService
   {
-    protected override void OnMessage(object sender, MessageEventArgs e)
+    protected override void OnMessage(MessageEventArgs e)
     {
       var msg = QueryString.Exists("name")
               ? String.Format("'{0}' returns to {1}", e.Data, QueryString["name"])
diff --git a/Example2/Example2.pidb b/Example2/Example2.pidb
index 79a5d499..b7225fcd 100644
Binary files a/Example2/Example2.pidb and b/Example2/Example2.pidb differ
diff --git a/Example2/Program.cs b/Example2/Program.cs
index a02f2012..8275fcd9 100644
--- a/Example2/Program.cs
+++ b/Example2/Program.cs
@@ -40,7 +40,7 @@ namespace Example2
       wssv.Start();
       Console.WriteLine(
         "WebSocket Server listening on port: {0} service path:", wssv.Port);
-      foreach (var path in wssv.ServicePath)
+      foreach (var path in wssv.ServicePaths)
         Console.WriteLine("  {0}", path);
       Console.WriteLine();
        
diff --git a/Example2/bin/Debug/example2.exe b/Example2/bin/Debug/example2.exe
index 727b45f7..71f5f0e9 100755
Binary files a/Example2/bin/Debug/example2.exe and b/Example2/bin/Debug/example2.exe differ
diff --git a/Example2/bin/Debug/example2.exe.mdb b/Example2/bin/Debug/example2.exe.mdb
index 7f51dd0e..72ec4450 100644
Binary files a/Example2/bin/Debug/example2.exe.mdb and b/Example2/bin/Debug/example2.exe.mdb differ
diff --git a/Example2/bin/Debug/websocket-sharp.dll b/Example2/bin/Debug/websocket-sharp.dll
index 18aa4731..2234c67b 100755
Binary files a/Example2/bin/Debug/websocket-sharp.dll and b/Example2/bin/Debug/websocket-sharp.dll differ
diff --git a/Example2/bin/Debug/websocket-sharp.dll.mdb b/Example2/bin/Debug/websocket-sharp.dll.mdb
index e6ebba4f..5104efe3 100644
Binary files a/Example2/bin/Debug/websocket-sharp.dll.mdb and b/Example2/bin/Debug/websocket-sharp.dll.mdb differ
diff --git a/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe
index f89b4877..56109290 100755
Binary files a/Example2/bin/Debug_Ubuntu/example2.exe and b/Example2/bin/Debug_Ubuntu/example2.exe differ
diff --git a/Example2/bin/Debug_Ubuntu/example2.exe.mdb b/Example2/bin/Debug_Ubuntu/example2.exe.mdb
index b02edbea..248d1f26 100644
Binary files a/Example2/bin/Debug_Ubuntu/example2.exe.mdb and b/Example2/bin/Debug_Ubuntu/example2.exe.mdb differ
diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll
index 1479b294..263f150d 100755
Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll differ
diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
index 2573ad40..064f6637 100644
Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ
diff --git a/Example2/bin/Release/example2.exe b/Example2/bin/Release/example2.exe
index ee01b0d7..e46fa894 100755
Binary files a/Example2/bin/Release/example2.exe and b/Example2/bin/Release/example2.exe differ
diff --git a/Example2/bin/Release/websocket-sharp.dll b/Example2/bin/Release/websocket-sharp.dll
index 334ea401..9e8af838 100755
Binary files a/Example2/bin/Release/websocket-sharp.dll and b/Example2/bin/Release/websocket-sharp.dll differ
diff --git a/Example2/bin/Release_Ubuntu/example2.exe b/Example2/bin/Release_Ubuntu/example2.exe
index b820e640..26c56889 100755
Binary files a/Example2/bin/Release_Ubuntu/example2.exe and b/Example2/bin/Release_Ubuntu/example2.exe differ
diff --git a/Example2/bin/Release_Ubuntu/websocket-sharp.dll b/Example2/bin/Release_Ubuntu/websocket-sharp.dll
index 22462df0..bdcc677b 100755
Binary files a/Example2/bin/Release_Ubuntu/websocket-sharp.dll and b/Example2/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/Example3/Chat.cs b/Example3/Chat.cs
index 2e96c16e..85e920fe 100644
--- a/Example3/Chat.cs
+++ b/Example3/Chat.cs
@@ -23,22 +23,22 @@ namespace Example3 {
       return Interlocked.Increment(ref _num);
     }
 
-    protected override void OnOpen(object sender, EventArgs e)
+    protected override void OnOpen()
     {
       _name = getName();
     }
 
-    protected override void OnMessage(object sender, MessageEventArgs e)
+    protected override void OnMessage(MessageEventArgs e)
     {
       
       var msg = String.Format("{0}: {1}", _name, e.Data);
-      Publish(msg);
+      Broadcast(msg);
     }
 
-    protected override void OnClose(object sender, CloseEventArgs e)
+    protected override void OnClose(CloseEventArgs e)
     {
       var msg = String.Format("{0} got logged off...", _name);
-      Publish(msg);
+      Broadcast(msg);
     }
   }
 }
diff --git a/Example3/Echo.cs b/Example3/Echo.cs
index 637a0e16..48c36d64 100644
--- a/Example3/Echo.cs
+++ b/Example3/Echo.cs
@@ -6,7 +6,7 @@ namespace Example3 {
 
   public class Echo : WebSocketService
   {
-    protected override void OnMessage(object sender, MessageEventArgs e)
+    protected override void OnMessage(MessageEventArgs e)
     {
       var msg = QueryString.Exists("name")
               ? String.Format("'{0}' returns to {1}", e.Data, QueryString["name"])
diff --git a/Example3/Example3.pidb b/Example3/Example3.pidb
index 2c4bf55e..02340dae 100644
Binary files a/Example3/Example3.pidb and b/Example3/Example3.pidb differ
diff --git a/Example3/bin/Debug/Example3.exe b/Example3/bin/Debug/Example3.exe
index e0ecb48f..3df43495 100755
Binary files a/Example3/bin/Debug/Example3.exe and b/Example3/bin/Debug/Example3.exe differ
diff --git a/Example3/bin/Debug/Example3.exe.mdb b/Example3/bin/Debug/Example3.exe.mdb
index d1af032f..ca2e3e84 100644
Binary files a/Example3/bin/Debug/Example3.exe.mdb and b/Example3/bin/Debug/Example3.exe.mdb differ
diff --git a/Example3/bin/Debug/websocket-sharp.dll b/Example3/bin/Debug/websocket-sharp.dll
index 18aa4731..2234c67b 100755
Binary files a/Example3/bin/Debug/websocket-sharp.dll and b/Example3/bin/Debug/websocket-sharp.dll differ
diff --git a/Example3/bin/Debug/websocket-sharp.dll.mdb b/Example3/bin/Debug/websocket-sharp.dll.mdb
index e6ebba4f..5104efe3 100644
Binary files a/Example3/bin/Debug/websocket-sharp.dll.mdb and b/Example3/bin/Debug/websocket-sharp.dll.mdb differ
diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe
index 2796c7f7..e3cc31b0 100755
Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe and b/Example3/bin/Debug_Ubuntu/Example3.exe differ
diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb
index 6e929246..dc2a375d 100644
Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb and b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb differ
diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll
index 1479b294..263f150d 100755
Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll differ
diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
index 2573ad40..064f6637 100644
Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ
diff --git a/Example3/bin/Release/Example3.exe b/Example3/bin/Release/Example3.exe
index f79eb1f4..3620a30e 100755
Binary files a/Example3/bin/Release/Example3.exe and b/Example3/bin/Release/Example3.exe differ
diff --git a/Example3/bin/Release/websocket-sharp.dll b/Example3/bin/Release/websocket-sharp.dll
index 334ea401..9e8af838 100755
Binary files a/Example3/bin/Release/websocket-sharp.dll and b/Example3/bin/Release/websocket-sharp.dll differ
diff --git a/Example3/bin/Release_Ubuntu/Example3.exe b/Example3/bin/Release_Ubuntu/Example3.exe
index ec78f681..91e5f221 100755
Binary files a/Example3/bin/Release_Ubuntu/Example3.exe and b/Example3/bin/Release_Ubuntu/Example3.exe differ
diff --git a/Example3/bin/Release_Ubuntu/websocket-sharp.dll b/Example3/bin/Release_Ubuntu/websocket-sharp.dll
index 22462df0..bdcc677b 100755
Binary files a/Example3/bin/Release_Ubuntu/websocket-sharp.dll and b/Example3/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/README.md b/README.md
index cef4fd7f..4e1a3cbd 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 #### Step 1 ####
 
-Required namespaces.
+Required namespace.
 
 ```cs
 using WebSocketSharp;
@@ -163,7 +163,7 @@ using WebSocketSharp.Server;
 
 public class Echo : WebSocketService
 {
-  protected override void OnMessage(object sender, MessageEventArgs e)
+  protected override void OnMessage(MessageEventArgs e)
   {
     Send(e.Data);
   }
@@ -179,9 +179,9 @@ using WebSocketSharp.Server;
 
 public class Chat : WebSocketService
 {
-  protected override void OnMessage(object sender, MessageEventArgs e)
+  protected override void OnMessage(MessageEventArgs e)
   {
-    Publish(e.Data);
+    Broadcast(e.Data);
   }
 }
 ```
diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs
index 4dfe2873..6415453a 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -74,28 +74,59 @@ namespace WebSocketSharp {
     #region Public Methods
 
     /// <summary>
-    /// Accept a WebSocket connection by the <see cref="TcpListener"/>.
+    /// Accepts a WebSocket connection by the <see cref="TcpListener"/>.
     /// </summary>
     /// <returns>
-    /// A <see cref="WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext"/> that contains a WebSocket connection.
+    /// A <see cref="TcpListenerWebSocketContext"/> that contains a WebSocket connection.
     /// </returns>
-    /// <param name="client">
-    /// A <see cref="TcpClient"/> that contains a TCP connection to accept a WebSocket connection from.
+    /// <param name="listener">
+    /// A <see cref="TcpListener"/> that provides a TCP connection to accept a WebSocket connection.
     /// </param>
     /// <param name="secure">
     /// A <see cref="bool"/> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
     /// </param>
     /// <exception cref="ArgumentNullException">
-    /// Is thrown when the <paramref name="client"/> parameter passed to a method is invalid because it is <see langword="null"/>.
+    /// <paramref name="listener"/> is <see langword="null"/>.
     /// </exception>
-    public static TcpListenerWebSocketContext AcceptWebSocket(this TcpClient client, bool secure)
+    public static TcpListenerWebSocketContext AcceptWebSocket(this TcpListener listener, bool secure)
     {
-      if (client.IsNull())
-        throw new ArgumentNullException("client");
+      if (listener.IsNull())
+        throw new ArgumentNullException("listener");
 
+      var client = listener.AcceptTcpClient();
       return new TcpListenerWebSocketContext(client, secure);
     }
 
+    /// <summary>
+    /// Accepts a WebSocket connection asynchronously by the <see cref="TcpListener"/>.
+    /// </summary>
+    /// <param name="listener">
+    /// A <see cref="TcpListener"/> that provides a TCP connection to accept a WebSocket connection.
+    /// </param>
+    /// <param name="secure">
+    /// A <see cref="bool"/> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
+    /// </param>
+    /// <param name="completed">
+    /// An Action&lt;TcpListenerWebSocketContext&gt; delegate that contains the method(s) that is called when an asynchronous operation completes.
+    /// </param>
+    /// <exception cref="ArgumentNullException">
+    /// <paramref name="listener"/> is <see langword="null"/>.
+    /// </exception>
+    public static void AcceptWebSocketAsync(this TcpListener listener, bool secure, Action<TcpListenerWebSocketContext> completed)
+    {
+      if (listener.IsNull())
+        throw new ArgumentNullException("listener");
+
+      AsyncCallback callback = (ar) =>
+      {
+        var client  = listener.EndAcceptTcpClient(ar);
+        var context = new TcpListenerWebSocketContext(client, secure);
+        completed(context);
+      };
+
+      listener.BeginAcceptTcpClient(callback, null);
+    }
+
     /// <summary>
     /// Emit the specified <see cref="EventHandler"/> delegate if is not <see langword="null"/>.
     /// </summary>
diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index 4af51142..de8359f3 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -40,7 +40,7 @@ namespace WebSocketSharp.Server {
   /// Provides the functions of the server that receives the WebSocket connection requests.
   /// </summary>
   /// <remarks>
-  /// The WebSocketServer class provides multi WebSocket service.
+  /// The WebSocketServer class provides the multi WebSocket service.
   /// </remarks>
   public class WebSocketServer : WebSocketServerBase
   {
@@ -53,7 +53,7 @@ namespace WebSocketSharp.Server {
     #region Public Constructors
 
     /// <summary>
-    /// Initializes a new instance of the WebSocketServer class.
+    /// Initializes a new instance of the <see cref="WebSocketServer"/> class.
     /// </summary>
     public WebSocketServer()
       : this(80)
@@ -61,7 +61,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+    /// Initializes a new instance of the <see cref="WebSocketServer"/> class that listens for incoming connection attempts
     /// on the specified <paramref name="port"/>.
     /// </summary>
     /// <param name="port">
@@ -73,7 +73,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+    /// Initializes a new instance of the <see cref="WebSocketServer"/> class that listens for incoming connection attempts
     /// on the specified WebSocket URL.
     /// </summary>
     /// <param name="url">
@@ -92,7 +92,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+    /// Initializes a new instance of the <see cref="WebSocketServer"/> class that listens for incoming connection attempts
     /// on the specified <paramref name="port"/> and <paramref name="secure"/>.
     /// </summary>
     /// <param name="port">
@@ -107,11 +107,11 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+    /// Initializes a new instance of the <see cref="WebSocketServer"/> class that listens for incoming connection attempts
     /// on the specified <paramref name="address"/> and <paramref name="port"/>.
     /// </summary>
     /// <param name="address">
-    /// An <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -122,11 +122,11 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+    /// Initializes a new instance of the <see cref="WebSocketServer"/> class that listens for incoming connection attempts
     /// on the specified <paramref name="address"/>, <paramref name="port"/> and <paramref name="secure"/>.
     /// </summary>
     /// <param name="address">
-    /// An <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -145,12 +145,12 @@ namespace WebSocketSharp.Server {
     #region Properties
 
     /// <summary>
-    /// Gets the service paths.
+    /// Gets the paths associated with the each WebSocket services.
     /// </summary>
     /// <value>
-    /// An IEnumerable&lt;string&gt; that contains the service paths.
+    /// An IEnumerable&lt;string&gt; that contains the paths.
     /// </value>
-    public IEnumerable<string> ServicePath {
+    public IEnumerable<string> ServicePaths {
       get {
         var url = BaseUri.IsAbsoluteUri
                 ? BaseUri.ToString().TrimEnd('/')
@@ -190,16 +190,15 @@ namespace WebSocketSharp.Server {
     #region Protected Method
 
     /// <summary>
-    /// Accepts the WebSocket connection.
+    /// Accepts a WebSocket connection.
     /// </summary>
-    /// <param name="client">
-    /// A <see cref="TcpClient"/> that contains the TCP connection.
+    /// <param name="context">
+    /// A <see cref="TcpListenerWebSocketContext"/> that contains a WebSocket connection.
     /// </param>
-    protected override void AcceptWebSocket(TcpClient client)
+    protected override void AcceptWebSocket(TcpListenerWebSocketContext context)
     {
-      var context = client.AcceptWebSocket(IsSecure);
-      var socket  = context.WebSocket;
-      var path    = context.Path.UrlDecode();
+      var socket = context.WebSocket;
+      var path   = context.Path.UrlDecode();
 
       IServiceHost svcHost;
       if (!_services.TryGetServiceHost(path, out svcHost))
@@ -219,13 +218,13 @@ namespace WebSocketSharp.Server {
     #region Public Methods
 
     /// <summary>
-    /// Adds the WebSocket service.
+    /// Adds a WebSocket service.
     /// </summary>
     /// <param name="absPath">
-    /// A <see cref="string"/> that contains an absolute path associated with the WebSocket service.
+    /// A <see cref="string"/> that contains an absolute path associated with a WebSocket service.
     /// </param>
     /// <typeparam name="T">
-    /// The type of the WebSocket service. The T must inherit the <see cref="WebSocketService"/> class.
+    /// The type of a WebSocket service. The T must inherit the <see cref="WebSocketService"/> class.
     /// </typeparam>
     public void AddService<T>(string absPath)
       where T : WebSocketService, new()
@@ -248,7 +247,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Broadcasts the specified <see cref="string"/>.
+    /// Broadcasts the specified <see cref="string"/> to all clients.
     /// </summary>
     /// <param name="data">
     /// A <see cref="string"/> to broadcast.
diff --git a/websocket-sharp/Server/WebSocketServerBase.cs b/websocket-sharp/Server/WebSocketServerBase.cs
index 940f78c7..1cd0c3c7 100644
--- a/websocket-sharp/Server/WebSocketServerBase.cs
+++ b/websocket-sharp/Server/WebSocketServerBase.cs
@@ -31,6 +31,7 @@ using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
+using WebSocketSharp.Net.WebSockets;
 
 namespace WebSocketSharp.Server {
 
@@ -44,7 +45,7 @@ namespace WebSocketSharp.Server {
 
     #region Fields
 
-    private Thread      _acceptClientThread;
+    private Thread      _receiveRequestThread;
     private IPAddress   _address;
     private bool        _isSecure;
     private bool        _isSelfHost;
@@ -57,7 +58,7 @@ namespace WebSocketSharp.Server {
     #region Constructors
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="WebSocketSharp.Server.WebSocketServerBase"/> class.
+    /// Initializes a new instance of the <see cref="WebSocketServerBase"/> class.
     /// </summary>
     protected WebSocketServerBase()
     {
@@ -65,7 +66,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="WebSocketSharp.Server.WebSocketServerBase"/> class that listens for incoming connection attempts
+    /// Initializes a new instance of the <see cref="WebSocketServerBase"/> class that listens for incoming connection attempts
     /// on the specified WebSocket URL.
     /// </summary>
     /// <param name="url">
@@ -91,17 +92,17 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="WebSocketSharp.Server.WebSocketServerBase"/> class that listens for incoming connection attempts
+    /// Initializes a new instance of the <see cref="WebSocketServerBase"/> class that listens for incoming connection attempts
     /// on the specified <paramref name="address"/>, <paramref name="port"/>, <paramref name="absPath"/> and <paramref name="secure"/>.
     /// </summary>
     /// <param name="address">
-    /// An <see cref="IPAddress"/> that contains a local IP address.
+    /// A <see cref="IPAddress"/> that contains an IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
     /// </param>
     /// <param name="absPath">
-    /// A <see cref="string"/> that contains a absolute path.
+    /// A <see cref="string"/> that contains an absolute path.
     /// </param>
     /// <param name="secure">
     /// A <see cref="bool"/> that indicates providing a secure connection or not. (<c>true</c> indicates providing a secure connection.)
@@ -176,10 +177,10 @@ namespace WebSocketSharp.Server {
     #region Public Properties
 
     /// <summary>
-    /// Gets the local IP address on which to listen for incoming connection attempts.
+    /// Gets the IP address on which to listen for incoming connection attempts.
     /// </summary>
     /// <value>
-    /// A <see cref="IPAddress"/> that contains a local IP address.
+    /// A <see cref="IPAddress"/> that contains an IP address.
     /// </value>
     public IPAddress Address {
       get {
@@ -188,10 +189,10 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Gets a value indicating whether this server is secure.
+    /// Gets a value indicating whether this server provides secure connection.
     /// </summary>
     /// <value>
-    /// <c>true</c> if this server is secure; otherwise, <c>false</c>.
+    /// <c>true</c> if this server provides secure connection; otherwise, <c>false</c>.
     /// </value>
     public bool IsSecure {
       get {
@@ -236,35 +237,13 @@ namespace WebSocketSharp.Server {
 
     #region Private Methods
 
-    private void acceptClient()
+    private void acceptWebSocketAsync(TcpListenerWebSocketContext context)
     {
-      while (true)
-      {
-        try
-        {
-          var client = _tcpListener.AcceptTcpClient();
-          acceptSocketAsync(client);
-        }
-        catch (SocketException)
-        {
-          // TcpListener has been stopped.
-          break;
-        }
-        catch (Exception ex)
-        {
-          onError(ex.Message);
-          break;
-        }
-      }
-    }
-
-    private void acceptSocketAsync(TcpClient client)
-    {
-      WaitCallback acceptSocketCb = (state) =>
+      WaitCallback callback = (state) =>
       {
         try
         {
-          AcceptWebSocket(client);
+          AcceptWebSocket(context);
         }
         catch (Exception ex)
         {
@@ -272,7 +251,7 @@ namespace WebSocketSharp.Server {
         }
       };
 
-      ThreadPool.QueueUserWorkItem(acceptSocketCb);
+      ThreadPool.QueueUserWorkItem(callback);
     }
 
     private void init()
@@ -308,11 +287,33 @@ namespace WebSocketSharp.Server {
       OnError.Emit(this, new ErrorEventArgs(message));
     }
 
-    private void startAcceptClientThread()
+    private void receiveRequest()
+    {
+      while (true)
+      {
+        try
+        {
+          var context = _tcpListener.AcceptWebSocket(_isSecure);
+          acceptWebSocketAsync(context);
+        }
+        catch (SocketException)
+        {
+          // TcpListener has been stopped.
+          break;
+        }
+        catch (Exception ex)
+        {
+          onError(ex.Message);
+          break;
+        }
+      }
+    }
+
+    private void startReceiveRequestThread()
     {
-      _acceptClientThread = new Thread(new ThreadStart(acceptClient)); 
-      _acceptClientThread.IsBackground = true;
-      _acceptClientThread.Start();
+      _receiveRequestThread = new Thread(new ThreadStart(receiveRequest)); 
+      _receiveRequestThread.IsBackground = true;
+      _receiveRequestThread.Start();
     }
 
     private bool tryCreateUri(string uriString, out Uri result, out string message)
@@ -335,15 +336,15 @@ namespace WebSocketSharp.Server {
     #region Protected Methods
 
     /// <summary>
-    /// Accepts the WebSocket connection.
+    /// Accepts a WebSocket connection.
     /// </summary>
-    /// <param name="client">
-    /// A <see cref="TcpClient"/> that contains the WebSocket connection.
+    /// <param name="context">
+    /// A <see cref="TcpListenerWebSocketContext"/> that contains a WebSocket connection.
     /// </param>
-    protected abstract void AcceptWebSocket(TcpClient client);
+    protected abstract void AcceptWebSocket(TcpListenerWebSocketContext context);
 
     /// <summary>
-    /// Occurs the <see cref="WebSocketServerBase.OnError"/> event with the specified <paramref name="message"/>.
+    /// Occurs the <see cref="WebSocketServerBase.OnError"/> event with the specified <see cref="string"/>.
     /// </summary>
     /// <param name="message">
     /// A <see cref="string"/> that contains an error message.
@@ -366,7 +367,7 @@ namespace WebSocketSharp.Server {
         return;
 
       _tcpListener.Start();
-      startAcceptClientThread();
+      startReceiveRequestThread();
     }
 
     /// <summary>
@@ -378,7 +379,7 @@ namespace WebSocketSharp.Server {
         return;
 
       _tcpListener.Stop();
-      _acceptClientThread.Join(5 * 1000);
+      _receiveRequestThread.Join(5 * 1000);
     }
 
     #endregion
diff --git a/websocket-sharp/Server/WebSocketService.cs b/websocket-sharp/Server/WebSocketService.cs
index cbe0fa32..dead0831 100644
--- a/websocket-sharp/Server/WebSocketService.cs
+++ b/websocket-sharp/Server/WebSocketService.cs
@@ -33,6 +33,12 @@ using System.Threading;
 
 namespace WebSocketSharp.Server {
 
+  /// <summary>
+  /// Provides the basic functions of the WebSocket service.
+  /// </summary>
+  /// <remarks>
+  /// The WebSocketService class is an abstract class.
+  /// </remarks>
   public abstract class WebSocketService {
 
     #region Private Fields
@@ -44,6 +50,9 @@ namespace WebSocketSharp.Server {
 
     #region Public Constructor
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebSocketService"/> class.
+    /// </summary>
     public WebSocketService()
     {
       ID      = String.Empty;
@@ -54,12 +63,24 @@ namespace WebSocketSharp.Server {
 
     #region Protected Properties
 
+    /// <summary>
+    /// Gets the HTTP query string variables used in the WebSocket opening handshake.
+    /// </summary>
+    /// <value>
+    /// A <see cref="NameValueCollection"/> that contains the query string variables.
+    /// </value>
     protected NameValueCollection QueryString {
       get {
         return IsBound ? _socket.QueryString : null;
       }
     }
 
+    /// <summary>
+    /// Gets the sessions to the WebSocket service.
+    /// </summary>
+    /// <value>
+    /// A <see cref="SessionManager"/> that contains the sessions to the WebSocket service.
+    /// </value>
     protected SessionManager Sessions {
       get {
         return IsBound ? _sessions : null;
@@ -70,44 +91,46 @@ namespace WebSocketSharp.Server {
 
     #region Public Properties
 
-    public string ID      { get; private set; }
-    public bool   IsBound { get; private set; }
+    /// <summary>
+    /// Gets the ID of a <see cref="WebSocketService"/> instance.
+    /// </summary>
+    /// <value>
+    /// A <see cref="string"/> that contains a ID.
+    /// </value>
+    public string ID { get; private set; }
+
+    /// <summary>
+    /// Gets a value indicating whether a <see cref="WebSocketService"/> instance is bound to a <see cref="WebSocket"/>.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if the WebSocketService is bound to a WebSocket; otherwise, <c>false</c>.
+    /// </value>
+    public bool IsBound { get; private set; }
 
     #endregion
 
-    #region Private Method
+    #region Private Methods
 
-    private void defaultBind()
+    private void onClose(object sender, CloseEventArgs e)
     {
-      _socket.OnOpen += (sender, e) =>
-      {
-        ID = _sessions.Add(this);
-      };
-
-      _socket.OnClose += (sender, e) =>
-      {
-        _sessions.Remove(ID);
-      };
+      _sessions.Remove(ID);
+      OnClose(e);
     }
 
-    #endregion
-
-    #region Protected Methods
-
-    protected virtual void OnClose(object sender, CloseEventArgs e)
+    private void onError(object sender, ErrorEventArgs e)
     {
+      OnError(e);
     }
 
-    protected virtual void OnError(object sender, ErrorEventArgs e)
+    private void onMessage(object sender, MessageEventArgs e)
     {
+      OnMessage(e);
     }
 
-    protected virtual void OnMessage(object sender, MessageEventArgs e)
-    {
-    }
-
-    protected virtual void OnOpen(object sender, EventArgs e)
+    private void onOpen(object sender, EventArgs e)
     {
+      ID = _sessions.Add(this);
+      OnOpen();
     }
 
     #endregion
@@ -126,51 +149,182 @@ namespace WebSocketSharp.Server {
 
     #endregion
 
+    #region Protected Methods
+
+    /// <summary>
+    /// Occurs when a inner <see cref="WebSocket"/> receives a Close frame or the Stop method is called.
+    /// </summary>
+    /// <param name="e">
+    /// A <see cref="CloseEventArgs"/> that contains the event data associated with a <see cref="WebSocket.OnClose"/> event.
+    /// </param>
+    protected virtual void OnClose(CloseEventArgs e)
+    {
+    }
+
+    /// <summary>
+    /// Occurs when a inner <see cref="WebSocket"/> gets an error.
+    /// </summary>
+    /// <param name="e">
+    /// An <see cref="ErrorEventArgs"/> that contains the event data associated with a <see cref="WebSocket.OnError"/> event.
+    /// </param>
+    protected virtual void OnError(ErrorEventArgs e)
+    {
+    }
+
+    /// <summary>
+    /// Occurs when a inner <see cref="WebSocket"/> receives a data frame.
+    /// </summary>
+    /// <param name="e">
+    /// A <see cref="MessageEventArgs"/> that contains the event data associated with a <see cref="WebSocket.OnMessage"/> event.
+    /// </param>
+    protected virtual void OnMessage(MessageEventArgs e)
+    {
+    }
+
+    /// <summary>
+    /// Occurs when the WebSocket connection has been established.
+    /// </summary>
+    protected virtual void OnOpen()
+    {
+    }
+
+    #endregion
+
     #region Public Methods
 
+    /// <summary>
+    /// Binds the specified <see cref="WebSocket"/> and <see cref="SessionManager"/>
+    /// to a <see cref="WebSocketService"/> instance.
+    /// </summary>
+    /// <param name="socket">
+    /// A <see cref="WebSocket"/> to bind to the WebSocketService.
+    /// </param>
+    /// <param name="sessions">
+    /// A <see cref="SessionManager"/> to bind to the WebSocketService.
+    /// </param>
     public void Bind(WebSocket socket, SessionManager sessions)
     {
+      if (IsBound)
+        return;
+
       _socket   = socket;
       _sessions = sessions;
 
-      defaultBind();
-      _socket.OnOpen    += OnOpen;
-      _socket.OnMessage += OnMessage;
-      _socket.OnError   += OnError;
-      _socket.OnClose   += OnClose;
+      _socket.OnOpen    += onOpen;
+      _socket.OnMessage += onMessage;
+      _socket.OnError   += onError;
+      _socket.OnClose   += onClose;
 
       IsBound = true;
     }
 
-    public bool Ping()
+    /// <summary>
+    /// Broadcasts the specified array of <see cref="byte"/> to all clients of the WebSocket service.
+    /// </summary>
+    /// <param name="data">
+    /// An array of <see cref="byte"/> to broadcast.
+    /// </param>
+    public void Broadcast(byte[] data)
     {
-      return Ping(String.Empty);
+      if (IsBound)
+        _sessions.Broadcast(data);
     }
 
-    public bool Ping(string message)
+    /// <summary>
+    /// Broadcasts the specified <see cref="string"/> to all clients of the WebSocket service.
+    /// </summary>
+    /// <param name="data">
+    /// A <see cref="string"/> to broadcast.
+    /// </param>
+    public void Broadcast(string data)
     {
-      return IsBound
-             ? _socket.Ping(message)
-             : false;
+      if (IsBound)
+        _sessions.Broadcast(data);
     }
 
-    public Dictionary<string, bool> PingAround()
+    /// <summary>
+    /// Pings to all clients of the WebSocket service.
+    /// </summary>
+    /// <returns>
+    /// A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+    /// indicating whether the WebSocket service received a Pong in a time.
+    /// </returns>
+    public Dictionary<string, bool> Broadping()
     {
-      return PingAround(String.Empty);
+      return Broadping(String.Empty);
     }
 
-    public Dictionary<string, bool> PingAround(string message)
+    /// <summary>
+    /// Pings with the specified <see cref="string"/> to all clients of the WebSocket service.
+    /// </summary>
+    /// <returns>
+    /// A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+    /// indicating whether the WebSocket service received a Pong in a time.
+    /// </returns>
+    /// <param name="message">
+    /// A <see cref="string"/> that contains a message.
+    /// </param>
+    public Dictionary<string, bool> Broadping(string message)
     {
       return IsBound
              ? _sessions.Broadping(message)
              : null;
     }
 
+    /// <summary>
+    /// Pings to the client of a <see cref="WebSocketService"/> instance.
+    /// </summary>
+    /// <returns>
+    /// <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+    /// </returns>
+    public bool Ping()
+    {
+      return Ping(String.Empty);
+    }
+
+    /// <summary>
+    /// Pings with the specified <see cref="string"/> to the client of a <see cref="WebSocketService"/> instance.
+    /// </summary>
+    /// <returns>
+    /// <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+    /// </returns>
+    /// <param name="message">
+    /// A <see cref="string"/> that contains a message.
+    /// </param>
+    public bool Ping(string message)
+    {
+      return IsBound
+             ? _socket.Ping(message)
+             : false;
+    }
+
+    /// <summary>
+    /// Pings to the client of a <see cref="WebSocketService"/> instance associated with the specified ID.
+    /// </summary>
+    /// <returns>
+    /// <c>true</c> if the WebSocket service receives a Pong in a time; otherwise, <c>false</c>.
+    /// </returns>
+    /// <param name="id">
+    /// A <see cref="string"/> that contains a ID that represents the destination for the Ping.
+    /// </param>
     public bool PingTo(string id)
     {
       return PingTo(id, String.Empty);
     }
 
+    /// <summary>
+    /// Pings with the specified <see cref="string"/> to the client of a <see cref="WebSocketService"/> instance
+    /// associated with the specified ID.
+    /// </summary>
+    /// <returns>
+    /// <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+    /// </returns>
+    /// <param name="id">
+    /// A <see cref="string"/> that contains a ID that represents the destination for the Ping.
+    /// </param>
+    /// <param name="message">
+    /// A <see cref="string"/> that contains a message.
+    /// </param>
     public bool PingTo(string id, string message)
     {
       if (!IsBound)
@@ -182,30 +336,39 @@ namespace WebSocketSharp.Server {
              : false;
     }
 
-    public void Publish(byte[] data)
-    {
-      if (IsBound)
-        _sessions.Broadcast(data);
-    }
-
-    public void Publish(string data)
-    {
-      if (IsBound)
-        _sessions.Broadcast(data);
-    }
-
+    /// <summary>
+    /// Sends a binary data to the client of a <see cref="WebSocketService"/> instance.
+    /// </summary>
+    /// <param name="data">
+    /// An array of <see cref="byte"/> that contains a binary data to send.
+    /// </param>
     public void Send(byte[] data)
     {
       if (IsBound)
         _socket.Send(data);
     }
 
+    /// <summary>
+    /// Sends a text data to the client of a <see cref="WebSocketService"/> instance.
+    /// </summary>
+    /// <param name="data">
+    /// A <see cref="string"/> that contains a text data to send.
+    /// </param>
     public void Send(string data)
     {
       if (IsBound)
         _socket.Send(data);
     }
 
+    /// <summary>
+    /// Sends a binary data to the client of a <see cref="WebSocketService"/> instance associated with the specified ID.
+    /// </summary>
+    /// <param name="id">
+    /// A <see cref="string"/> that contains a ID that represents the destination for the data.
+    /// </param>
+    /// <param name="data">
+    /// An array of <see cref="byte"/> that contains a binary data to send.
+    /// </param>
     public void SendTo(string id, byte[] data)
     {
       if (!IsBound)
@@ -216,6 +379,15 @@ namespace WebSocketSharp.Server {
         service.Send(data);
     }
 
+    /// <summary>
+    /// Sends a text data to the client of a <see cref="WebSocketService"/> instance associated with the specified ID.
+    /// </summary>
+    /// <param name="id">
+    /// A <see cref="string"/> that contains a ID that represents the destination for the data.
+    /// </param>
+    /// <param name="data">
+    /// A <see cref="string"/> that contains a text data to send.
+    /// </param>
     public void SendTo(string id, string data)
     {
       if (!IsBound)
@@ -226,12 +398,18 @@ namespace WebSocketSharp.Server {
         service.Send(data);
     }
 
+    /// <summary>
+    /// Starts a <see cref="WebSocketService"/> instance.
+    /// </summary>
     public void Start()
     {
       if (IsBound)
         _socket.Connect();
     }
 
+    /// <summary>
+    /// Stops a <see cref="WebSocketService"/> instance.
+    /// </summary>
     public void Stop()
     {
       if (!IsBound)
@@ -240,11 +418,29 @@ namespace WebSocketSharp.Server {
       _socket.Close();
     }
 
+    /// <summary>
+    /// Stops a <see cref="WebSocketService"/> instance with the specified <see cref="CloseStatusCode"/> and <see cref="string"/>.
+    /// </summary>
+    /// <param name="code">
+    /// One of the <see cref="CloseStatusCode"/> values that contains a status code indicating the reason for stop.
+    /// </param>
+    /// <param name="reason">
+    /// A <see cref="string"/> that contains a reason for stop.
+    /// </param>
     public void Stop(CloseStatusCode code, string reason)
     {
       Stop((ushort)code, reason);
     }
 
+    /// <summary>
+    /// Stops a <see cref="WebSocketService"/> instance with the specified <see cref="ushort"/> and <see cref="string"/>.
+    /// </summary>
+    /// <param name="code">
+    /// A <see cref="ushort"/> that contains a status code indicating the reason for stop.
+    /// </param>
+    /// <param name="reason">
+    /// A <see cref="string"/> that contains a reason for stop.
+    /// </param>
     public void Stop(ushort code, string reason)
     {
       if (!IsBound)
diff --git a/websocket-sharp/Server/WebSocketServiceHost.cs b/websocket-sharp/Server/WebSocketServiceHost.cs
index ab7e0eaf..d2278a1f 100644
--- a/websocket-sharp/Server/WebSocketServiceHost.cs
+++ b/websocket-sharp/Server/WebSocketServiceHost.cs
@@ -32,6 +32,7 @@ using System;
 using System.Collections.Generic;
 using System.Net.Sockets;
 using WebSocketSharp.Net;
+using WebSocketSharp.Net.WebSockets;
 
 namespace WebSocketSharp.Server {
 
@@ -39,7 +40,7 @@ namespace WebSocketSharp.Server {
   /// Provides the functions of the server that receives the WebSocket connection requests.
   /// </summary>
   /// <remarks>
-  /// The WebSocketServiceHost&lt;T&gt; class provides single WebSocket service.
+  /// The WebSocketServiceHost&lt;T&gt; class provides the single WebSocket service.
   /// </remarks>
   /// <typeparam name="T">
   /// The type of the WebSocket service that the server provides. The T must inherit the <see cref="WebSocketService"/> class.
@@ -142,7 +143,7 @@ namespace WebSocketSharp.Server {
     /// on the specified <paramref name="address"/>, <paramref name="port"/> and <paramref name="absPath"/>.
     /// </summary>
     /// <param name="address">
-    /// An <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -160,7 +161,7 @@ namespace WebSocketSharp.Server {
     /// on the specified <paramref name="address"/>, <paramref name="port"/>, <paramref name="absPath"/> and <paramref name="secure"/>.
     /// </summary>
     /// <param name="address">
-    /// An <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -244,16 +245,15 @@ namespace WebSocketSharp.Server {
     #region Protected Method
 
     /// <summary>
-    /// Accepts the WebSocket connection.
+    /// Accepts a WebSocket connection.
     /// </summary>
-    /// <param name="client">
-    /// A <see cref="TcpClient"/> that contains the TCP connection.
+    /// <param name="context">
+    /// A <see cref="TcpListenerWebSocketContext"/> that contains a WebSocket connection.
     /// </param>
-    protected override void AcceptWebSocket(TcpClient client)
+    protected override void AcceptWebSocket(TcpListenerWebSocketContext context)
     {
-      var context = client.AcceptWebSocket(IsSecure);
-      var socket  = context.WebSocket;
-      var path    = context.Path.UrlDecode();
+      var socket = context.WebSocket;
+      var path   = context.Path.UrlDecode();
       if (path != Uri.GetAbsolutePath().UrlDecode())
       {
         socket.Close(HttpStatusCode.NotImplemented);
@@ -271,7 +271,7 @@ namespace WebSocketSharp.Server {
     #region Public Methods
 
     /// <summary>
-    /// Broadcasts the specified <see cref="string"/>.
+    /// Broadcasts the specified <see cref="string"/> to all clients.
     /// </summary>
     /// <param name="data">
     /// A <see cref="string"/> to broadcast.
@@ -284,6 +284,10 @@ namespace WebSocketSharp.Server {
     /// <summary>
     /// Pings with the specified <see cref="string"/> to all clients.
     /// </summary>
+    /// <returns>
+    /// A Dictionary&lt;string, bool&gt; that contains the collection of the session ID and value
+    /// indicating whether the server received a Pong in a time.
+    /// </returns>
     /// <param name="message">
     /// A <see cref="string"/> that contains a message.
     /// </param>
diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs
index 67341cfb..ea077cca 100644
--- a/websocket-sharp/WebSocket.cs
+++ b/websocket-sharp/WebSocket.cs
@@ -303,24 +303,24 @@ namespace WebSocketSharp {
     #region Events
 
     /// <summary>
-    /// Occurs when the WebSocket connection has been established.
+    /// Occurs when the WebSocket receives a Close frame or the Close method is called.
     /// </summary>
-    public event EventHandler OnOpen;
+    public event EventHandler<CloseEventArgs> OnClose;
 
     /// <summary>
-    /// Occurs when the WebSocket receives a data frame.
+    /// Occurs when the WebSocket gets an error.
     /// </summary>
-    public event EventHandler<MessageEventArgs> OnMessage;
+    public event EventHandler<ErrorEventArgs> OnError;
 
     /// <summary>
-    /// Occurs when the WebSocket gets an error.
+    /// Occurs when the WebSocket receives a data frame.
     /// </summary>
-    public event EventHandler<ErrorEventArgs> OnError;
+    public event EventHandler<MessageEventArgs> OnMessage;
 
     /// <summary>
-    /// Occurs when the WebSocket receives a Close frame or the Close method is called.
+    /// Occurs when the WebSocket connection has been established.
     /// </summary>
-    public event EventHandler<CloseEventArgs> OnClose;
+    public event EventHandler OnOpen;
 
     #endregion
 
@@ -1140,7 +1140,7 @@ namespace WebSocketSharp {
     /// Closes the connection and releases all associated resources after sends a Close control frame.
     /// </summary>
     /// <param name="code">
-    /// A <see cref="WebSocketSharp.Frame.CloseStatusCode"/> that contains a status code indicating a reason for closure.
+    /// A <see cref="CloseStatusCode"/> that contains a status code indicating a reason for closure.
     /// </param>
     public void Close(CloseStatusCode code)
     {
@@ -1162,7 +1162,7 @@ namespace WebSocketSharp {
     /// Closes the connection and releases all associated resources after sends a Close control frame.
     /// </summary>
     /// <param name="code">
-    /// A <see cref="WebSocketSharp.Frame.CloseStatusCode"/> that contains a status code indicating a reason for closure.
+    /// A <see cref="CloseStatusCode"/> that contains a status code indicating a reason for closure.
     /// </param>
     /// <param name="reason">
     /// A <see cref="string"/> that contains a reason for closure.
@@ -1269,12 +1269,12 @@ namespace WebSocketSharp {
     }
 
     /// <summary>
-    /// Sends a text data using the connection.
+    /// Sends a binary data using the connection.
     /// </summary>
     /// <param name="data">
-    /// A <see cref="string"/> that contains the text data to be sent.
+    /// An array of <see cref="byte"/> that contains a binary data to send.
     /// </param>
-    public void Send(string data)
+    public void Send(byte[] data)
     {
       if (data.IsNull())
       {
@@ -1282,17 +1282,16 @@ namespace WebSocketSharp {
         return;
       }
 
-      var buffer = Encoding.UTF8.GetBytes(data);
-      send(Opcode.TEXT, buffer);
+      send(Opcode.BINARY, data);
     }
 
     /// <summary>
-    /// Sends a binary data using the connection.
+    /// Sends a text data using the connection.
     /// </summary>
     /// <param name="data">
-    /// An array of <see cref="byte"/> that contains the binary data to be sent.
+    /// A <see cref="string"/> that contains a text data to send.
     /// </param>
-    public void Send(byte[] data)
+    public void Send(string data)
     {
       if (data.IsNull())
       {
@@ -1300,14 +1299,15 @@ namespace WebSocketSharp {
         return;
       }
 
-      send(Opcode.BINARY, data);
+      var buffer = Encoding.UTF8.GetBytes(data);
+      send(Opcode.TEXT, buffer);
     }
 
     /// <summary>
     /// Sends a binary data using the connection.
     /// </summary>
     /// <param name="file">
-    /// A <see cref="FileInfo"/> that contains the binary data to be sent.
+    /// A <see cref="FileInfo"/> that contains a binary data to send.
     /// </param>
     public void Send(FileInfo file)
     {
@@ -1324,15 +1324,15 @@ namespace WebSocketSharp {
     }
 
     /// <summary>
-    /// Sends a text data asynchronously using the connection.
+    /// Sends a binary data asynchronously using the connection.
     /// </summary>
     /// <param name="data">
-    /// A <see cref="string"/> that contains the text data to be sent.
+    /// An array of <see cref="byte"/> that contains a binary data to send.
     /// </param>
     /// <param name="completed">
     /// An <see cref="Action"/> delegate that contains the method(s) that is called when an asynchronous operation completes.
     /// </param>
-    public void SendAsync(string data, Action completed)
+    public void SendAsync(byte[] data, Action completed)
     {
       if (data.IsNull())
       {
@@ -1340,20 +1340,19 @@ namespace WebSocketSharp {
         return;
       }
 
-      var buffer = Encoding.UTF8.GetBytes(data);
-      sendAsync(Opcode.TEXT, buffer, completed);
+      sendAsync(Opcode.BINARY, data, completed);
     }
 
     /// <summary>
-    /// Sends a binary data asynchronously using the connection.
+    /// Sends a text data asynchronously using the connection.
     /// </summary>
     /// <param name="data">
-    /// An array of <see cref="byte"/> that contains the binary data to be sent.
+    /// A <see cref="string"/> that contains a text data to send.
     /// </param>
     /// <param name="completed">
     /// An <see cref="Action"/> delegate that contains the method(s) that is called when an asynchronous operation completes.
     /// </param>
-    public void SendAsync(byte[] data, Action completed)
+    public void SendAsync(string data, Action completed)
     {
       if (data.IsNull())
       {
@@ -1361,14 +1360,15 @@ namespace WebSocketSharp {
         return;
       }
 
-      sendAsync(Opcode.BINARY, data, completed);
+      var buffer = Encoding.UTF8.GetBytes(data);
+      sendAsync(Opcode.TEXT, buffer, completed);
     }
 
     /// <summary>
     /// Sends a binary data asynchronously using the connection.
     /// </summary>
     /// <param name="file">
-    /// A <see cref="FileInfo"/> that contains the binary data to be sent.
+    /// A <see cref="FileInfo"/> that contains a binary data to send.
     /// </param>
     /// <param name="completed">
     /// An <see cref="Action"/> delegate that contains the method(s) that is called when an asynchronous operation completes.
diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll b/websocket-sharp/bin/Debug/websocket-sharp.dll
index 18aa4731..2234c67b 100755
Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll and b/websocket-sharp/bin/Debug/websocket-sharp.dll differ
diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb
index e6ebba4f..5104efe3 100644
Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb differ
diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
index 1479b294..263f150d 100755
Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll differ
diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb
index 2573ad40..064f6637 100644
Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ
diff --git a/websocket-sharp/bin/Release/websocket-sharp.dll b/websocket-sharp/bin/Release/websocket-sharp.dll
index 334ea401..9e8af838 100755
Binary files a/websocket-sharp/bin/Release/websocket-sharp.dll and b/websocket-sharp/bin/Release/websocket-sharp.dll differ
diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll
index 22462df0..bdcc677b 100755
Binary files a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
index 2c607ed9..0ca5374a 100644
--- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
+++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
@@ -9,21 +9,38 @@
             Provides a set of static methods for the websocket-sharp.
             </summary>
         </member>
-        <member name="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean)">
+        <member name="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean)">
             <summary>
-            Accept a WebSocket connection by the <see cref="T:System.Net.Sockets.TcpListener" />.
+            Accepts a WebSocket connection by the <see cref="T:System.Net.Sockets.TcpListener" />.
             </summary>
             <returns>
             A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </returns>
-            <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains a TCP connection to accept a WebSocket connection from.
+            <param name="listener">
+            A <see cref="T:System.Net.Sockets.TcpListener" /> that provides a TCP connection to accept a WebSocket connection.
             </param>
             <param name="secure">
             A <see cref="T:System.Boolean" /> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
             </param>
             <exception cref="T:System.ArgumentNullException">
-            Is thrown when the <paramref name="client" /> parameter passed to a method is invalid because it is <see langword="null" />.
+                <paramref name="listener" /> is <see langword="null" />.
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext})">
+            <summary>
+            Accepts a WebSocket connection asynchronously by the <see cref="T:System.Net.Sockets.TcpListener" />.
+            </summary>
+            <param name="listener">
+            A <see cref="T:System.Net.Sockets.TcpListener" /> that provides a TCP connection to accept a WebSocket connection.
+            </param>
+            <param name="secure">
+            A <see cref="T:System.Boolean" /> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
+            </param>
+            <param name="completed">
+            An Action&lt;TcpListenerWebSocketContext&gt; delegate that contains the method(s) that is called when an asynchronous operation completes.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+                <paramref name="listener" /> is <see langword="null" />.
             </exception>
         </member>
         <member name="M:WebSocketSharp.Ext.Emit(System.EventHandler,System.Object,System.EventArgs)">
@@ -792,24 +809,24 @@
                 <paramref name="url" /> is not valid WebSocket URL.
             </exception>
         </member>
-        <member name="E:WebSocketSharp.WebSocket.OnOpen">
+        <member name="E:WebSocketSharp.WebSocket.OnClose">
             <summary>
-            Occurs when the WebSocket connection has been established.
+            Occurs when the WebSocket receives a Close frame or the Close method is called.
             </summary>
         </member>
-        <member name="E:WebSocketSharp.WebSocket.OnMessage">
+        <member name="E:WebSocketSharp.WebSocket.OnError">
             <summary>
-            Occurs when the WebSocket receives a data frame.
+            Occurs when the WebSocket gets an error.
             </summary>
         </member>
-        <member name="E:WebSocketSharp.WebSocket.OnError">
+        <member name="E:WebSocketSharp.WebSocket.OnMessage">
             <summary>
-            Occurs when the WebSocket gets an error.
+            Occurs when the WebSocket receives a data frame.
             </summary>
         </member>
-        <member name="E:WebSocketSharp.WebSocket.OnClose">
+        <member name="E:WebSocketSharp.WebSocket.OnOpen">
             <summary>
-            Occurs when the WebSocket receives a Close frame or the Close method is called.
+            Occurs when the WebSocket connection has been established.
             </summary>
         </member>
         <member name="P:WebSocketSharp.WebSocket.Extensions">
@@ -870,7 +887,7 @@
             Closes the connection and releases all associated resources after sends a Close control frame.
             </summary>
             <param name="code">
-            A <see cref="!:WebSocketSharp.Frame.CloseStatusCode" /> that contains a status code indicating a reason for closure.
+            A <see cref="T:WebSocketSharp.CloseStatusCode" /> that contains a status code indicating a reason for closure.
             </param>
         </member>
         <member name="M:WebSocketSharp.WebSocket.Close(System.UInt16)">
@@ -886,7 +903,7 @@
             Closes the connection and releases all associated resources after sends a Close control frame.
             </summary>
             <param name="code">
-            A <see cref="!:WebSocketSharp.Frame.CloseStatusCode" /> that contains a status code indicating a reason for closure.
+            A <see cref="T:WebSocketSharp.CloseStatusCode" /> that contains a status code indicating a reason for closure.
             </param>
             <param name="reason">
             A <see cref="T:System.String" /> that contains a reason for closure.
@@ -938,20 +955,20 @@
                 <c>true</c> if the WebSocket receives a Pong frame in a time; otherwise, <c>false</c>.
             </returns>
         </member>
-        <member name="M:WebSocketSharp.WebSocket.Send(System.String)">
+        <member name="M:WebSocketSharp.WebSocket.Send(System.Byte[])">
             <summary>
-            Sends a text data using the connection.
+            Sends a binary data using the connection.
             </summary>
             <param name="data">
-            A <see cref="T:System.String" /> that contains the text data to be sent.
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
             </param>
         </member>
-        <member name="M:WebSocketSharp.WebSocket.Send(System.Byte[])">
+        <member name="M:WebSocketSharp.WebSocket.Send(System.String)">
             <summary>
-            Sends a binary data using the connection.
+            Sends a text data using the connection.
             </summary>
             <param name="data">
-            An array of <see cref="T:System.Byte" /> that contains the binary data to be sent.
+            A <see cref="T:System.String" /> that contains a text data to send.
             </param>
         </member>
         <member name="M:WebSocketSharp.WebSocket.Send(System.IO.FileInfo)">
@@ -959,26 +976,26 @@
             Sends a binary data using the connection.
             </summary>
             <param name="file">
-            A <see cref="T:System.IO.FileInfo" /> that contains the binary data to be sent.
+            A <see cref="T:System.IO.FileInfo" /> that contains a binary data to send.
             </param>
         </member>
-        <member name="M:WebSocketSharp.WebSocket.SendAsync(System.String,System.Action)">
+        <member name="M:WebSocketSharp.WebSocket.SendAsync(System.Byte[],System.Action)">
             <summary>
-            Sends a text data asynchronously using the connection.
+            Sends a binary data asynchronously using the connection.
             </summary>
             <param name="data">
-            A <see cref="T:System.String" /> that contains the text data to be sent.
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
             </param>
             <param name="completed">
             An <see cref="T:System.Action" /> delegate that contains the method(s) that is called when an asynchronous operation completes.
             </param>
         </member>
-        <member name="M:WebSocketSharp.WebSocket.SendAsync(System.Byte[],System.Action)">
+        <member name="M:WebSocketSharp.WebSocket.SendAsync(System.String,System.Action)">
             <summary>
-            Sends a binary data asynchronously using the connection.
+            Sends a text data asynchronously using the connection.
             </summary>
             <param name="data">
-            An array of <see cref="T:System.Byte" /> that contains the binary data to be sent.
+            A <see cref="T:System.String" /> that contains a text data to send.
             </param>
             <param name="completed">
             An <see cref="T:System.Action" /> delegate that contains the method(s) that is called when an asynchronous operation completes.
@@ -989,7 +1006,7 @@
             Sends a binary data asynchronously using the connection.
             </summary>
             <param name="file">
-            A <see cref="T:System.IO.FileInfo" /> that contains the binary data to be sent.
+            A <see cref="T:System.IO.FileInfo" /> that contains a binary data to send.
             </param>
             <param name="completed">
             An <see cref="T:System.Action" /> delegate that contains the method(s) that is called when an asynchronous operation completes.
@@ -1000,17 +1017,17 @@
             Provides the functions of the server that receives the WebSocket connection requests.
             </summary>
             <remarks>
-            The WebSocketServer class provides multi WebSocket service.
+            The WebSocketServer class provides the multi WebSocket service.
             </remarks>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.#ctor">
             <summary>
-            Initializes a new instance of the WebSocketServer class.
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class.
             </summary>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.#ctor(System.Int32)">
             <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="port" />.
             </summary>
             <param name="port">
@@ -1019,7 +1036,7 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.#ctor(System.String)">
             <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified WebSocket URL.
             </summary>
             <param name="url">
@@ -1028,7 +1045,7 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.#ctor(System.Int32,System.Boolean)">
             <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="port" /> and <paramref name="secure" />.
             </summary>
             <param name="port">
@@ -1040,11 +1057,11 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.#ctor(System.Net.IPAddress,System.Int32)">
             <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="address" /> and <paramref name="port" />.
             </summary>
             <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1052,11 +1069,11 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.#ctor(System.Net.IPAddress,System.Int32,System.Boolean)">
             <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="address" />, <paramref name="port" /> and <paramref name="secure" />.
             </summary>
             <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1065,12 +1082,12 @@
             A <see cref="T:System.Boolean" /> that indicates providing a secure connection or not. (<c>true</c> indicates providing a secure connection.)
             </param>
         </member>
-        <member name="P:WebSocketSharp.Server.WebSocketServer.ServicePath">
+        <member name="P:WebSocketSharp.Server.WebSocketServer.ServicePaths">
             <summary>
-            Gets the service paths.
+            Gets the paths associated with the each WebSocket services.
             </summary>
             <value>
-            An IEnumerable&lt;string&gt; that contains the service paths.
+            An IEnumerable&lt;string&gt; that contains the paths.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServer.Sweeped">
@@ -1081,28 +1098,28 @@
                 <c>true</c> if the server cleans up the inactive client; otherwise, <c>false</c>.
             </value>
         </member>
-        <member name="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(System.Net.Sockets.TcpClient)">
+        <member name="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">
             <summary>
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </summary>
-            <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains the TCP connection.
+            <param name="context">
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </param>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.AddService``1(System.String)">
             <summary>
-            Adds the WebSocket service.
+            Adds a WebSocket service.
             </summary>
             <param name="absPath">
-            A <see cref="T:System.String" /> that contains an absolute path associated with the WebSocket service.
+            A <see cref="T:System.String" /> that contains an absolute path associated with a WebSocket service.
             </param>
             <typeparam name="T">
-            The type of the WebSocket service. The T must inherit the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
+            The type of a WebSocket service. The T must inherit the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
             </typeparam>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.Broadcast(System.String)">
             <summary>
-            Broadcasts the specified <see cref="T:System.String" />.
+            Broadcasts the specified <see cref="T:System.String" /> to all clients.
             </summary>
             <param name="data">
             A <see cref="T:System.String" /> to broadcast.
@@ -1113,6 +1130,244 @@
             Stops receiving the WebSocket connection requests.
             </summary>
         </member>
+        <member name="T:WebSocketSharp.Server.WebSocketService">
+            <summary>
+            Provides the basic functions of the WebSocket service.
+            </summary>
+            <remarks>
+            The WebSocketService class is an abstract class.
+            </remarks>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
+            </summary>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketService.QueryString">
+            <summary>
+            Gets the HTTP query string variables used in the WebSocket opening handshake.
+            </summary>
+            <value>
+            A <see cref="T:System.Collections.Specialized.NameValueCollection" /> that contains the query string variables.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketService.Sessions">
+            <summary>
+            Gets the sessions to the WebSocket service.
+            </summary>
+            <value>
+            A <see cref="T:WebSocketSharp.Server.SessionManager" /> that contains the sessions to the WebSocket service.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketService.ID">
+            <summary>
+            Gets the ID of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+            <value>
+            A <see cref="T:System.String" /> that contains a ID.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketService.IsBound">
+            <summary>
+            Gets a value indicating whether a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance is bound to a <see cref="T:WebSocketSharp.WebSocket" />.
+            </summary>
+            <value>
+                <c>true</c> if the WebSocketService is bound to a WebSocket; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.OnClose(WebSocketSharp.CloseEventArgs)">
+            <summary>
+            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> receives a Close frame or the Stop method is called.
+            </summary>
+            <param name="e">
+            A <see cref="T:WebSocketSharp.CloseEventArgs" /> that contains the event data associated with a <see cref="E:WebSocketSharp.WebSocket.OnClose" /> event.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs)">
+            <summary>
+            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> gets an error.
+            </summary>
+            <param name="e">
+            An <see cref="T:WebSocketSharp.ErrorEventArgs" /> that contains the event data associated with a <see cref="E:WebSocketSharp.WebSocket.OnError" /> event.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs)">
+            <summary>
+            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> receives a data frame.
+            </summary>
+            <param name="e">
+            A <see cref="T:WebSocketSharp.MessageEventArgs" /> that contains the event data associated with a <see cref="E:WebSocketSharp.WebSocket.OnMessage" /> event.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.OnOpen">
+            <summary>
+            Occurs when the WebSocket connection has been established.
+            </summary>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Bind(WebSocketSharp.WebSocket,WebSocketSharp.Server.SessionManager)">
+            <summary>
+            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> and <see cref="T:WebSocketSharp.Server.SessionManager" />
+            to a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+            <param name="socket">
+            A <see cref="T:WebSocketSharp.WebSocket" /> to bind to the WebSocketService.
+            </param>
+            <param name="sessions">
+            A <see cref="T:WebSocketSharp.Server.SessionManager" /> to bind to the WebSocketService.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.Byte[])">
+            <summary>
+            Broadcasts the specified array of <see cref="T:System.Byte" /> to all clients of the WebSocket service.
+            </summary>
+            <param name="data">
+            An array of <see cref="T:System.Byte" /> to broadcast.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.String)">
+            <summary>
+            Broadcasts the specified <see cref="T:System.String" /> to all clients of the WebSocket service.
+            </summary>
+            <param name="data">
+            A <see cref="T:System.String" /> to broadcast.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Broadping">
+            <summary>
+            Pings to all clients of the WebSocket service.
+            </summary>
+            <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+            indicating whether the WebSocket service received a Pong in a time.
+            </returns>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String)">
+            <summary>
+            Pings with the specified <see cref="T:System.String" /> to all clients of the WebSocket service.
+            </summary>
+            <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+            indicating whether the WebSocket service received a Pong in a time.
+            </returns>
+            <param name="message">
+            A <see cref="T:System.String" /> that contains a message.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Ping">
+            <summary>
+            Pings to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+            <returns>
+                <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Ping(System.String)">
+            <summary>
+            Pings with the specified <see cref="T:System.String" /> to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+            <returns>
+                <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
+            <param name="message">
+            A <see cref="T:System.String" /> that contains a message.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String)">
+            <summary>
+            Pings to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance associated with the specified ID.
+            </summary>
+            <returns>
+                <c>true</c> if the WebSocket service receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
+            <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the Ping.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String)">
+            <summary>
+            Pings with the specified <see cref="T:System.String" /> to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified ID.
+            </summary>
+            <returns>
+                <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
+            <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the Ping.
+            </param>
+            <param name="message">
+            A <see cref="T:System.String" /> that contains a message.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Send(System.Byte[])">
+            <summary>
+            Sends a binary data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+            <param name="data">
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Send(System.String)">
+            <summary>
+            Sends a text data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+            <param name="data">
+            A <see cref="T:System.String" /> that contains a text data to send.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.Byte[])">
+            <summary>
+            Sends a binary data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance associated with the specified ID.
+            </summary>
+            <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            </param>
+            <param name="data">
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.String)">
+            <summary>
+            Sends a text data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance associated with the specified ID.
+            </summary>
+            <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            </param>
+            <param name="data">
+            A <see cref="T:System.String" /> that contains a text data to send.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Start">
+            <summary>
+            Starts a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Stop">
+            <summary>
+            Stops a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Stop(WebSocketSharp.CloseStatusCode,System.String)">
+            <summary>
+            Stops a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance with the specified <see cref="T:WebSocketSharp.CloseStatusCode" /> and <see cref="T:System.String" />.
+            </summary>
+            <param name="code">
+            One of the <see cref="T:WebSocketSharp.CloseStatusCode" /> values that contains a status code indicating the reason for stop.
+            </param>
+            <param name="reason">
+            A <see cref="T:System.String" /> that contains a reason for stop.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketService.Stop(System.UInt16,System.String)">
+            <summary>
+            Stops a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance with the specified <see cref="T:System.UInt16" /> and <see cref="T:System.String" />.
+            </summary>
+            <param name="code">
+            A <see cref="T:System.UInt16" /> that contains a status code indicating the reason for stop.
+            </param>
+            <param name="reason">
+            A <see cref="T:System.String" /> that contains a reason for stop.
+            </param>
+        </member>
         <member name="M:WebSocketSharp.Net.HttpUtility.HtmlDecode(System.String)">
             <summary>
             Decodes an HTML-encoded string and returns the decoded string.
@@ -1175,13 +1430,13 @@
             on the specified <paramref name="address" />, <paramref name="port" />, <paramref name="absPath" /> and <paramref name="secure" />.
             </summary>
             <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
             </param>
             <param name="absPath">
-            A <see cref="T:System.String" /> that contains a absolute path.
+            A <see cref="T:System.String" /> that contains an absolute path.
             </param>
             <param name="secure">
             A <see cref="T:System.Boolean" /> that indicates providing a secure connection or not. (<c>true</c> indicates providing a secure connection.)
@@ -1216,18 +1471,18 @@
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServerBase.Address">
             <summary>
-            Gets the local IP address on which to listen for incoming connection attempts.
+            Gets the IP address on which to listen for incoming connection attempts.
             </summary>
             <value>
-            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServerBase.IsSecure">
             <summary>
-            Gets a value indicating whether this server is secure.
+            Gets a value indicating whether this server provides secure connection.
             </summary>
             <value>
-                <c>true</c> if this server is secure; otherwise, <c>false</c>.
+                <c>true</c> if this server provides secure connection; otherwise, <c>false</c>.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServerBase.IsSelfHost">
@@ -1246,17 +1501,17 @@
             An <see cref="T:System.Int32" /> that contains a port number.
             </value>
         </member>
-        <member name="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient)">
+        <member name="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">
             <summary>
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </summary>
-            <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains the WebSocket connection.
+            <param name="context">
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </param>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServerBase.Error(System.String)">
             <summary>
-            Occurs the <see cref="E:WebSocketSharp.Server.WebSocketServerBase.OnError" /> event with the specified <paramref name="message" />.
+            Occurs the <see cref="E:WebSocketSharp.Server.WebSocketServerBase.OnError" /> event with the specified <see cref="T:System.String" />.
             </summary>
             <param name="message">
             A <see cref="T:System.String" /> that contains an error message.
@@ -1318,7 +1573,7 @@
             Provides the functions of the server that receives the WebSocket connection requests.
             </summary>
             <remarks>
-            The WebSocketServiceHost&lt;T&gt; class provides single WebSocket service.
+            The WebSocketServiceHost&lt;T&gt; class provides the single WebSocket service.
             </remarks>
             <typeparam name="T">
             The type of the WebSocket service that the server provides. The T must inherit the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
@@ -1387,7 +1642,7 @@
             on the specified <paramref name="address" />, <paramref name="port" /> and <paramref name="absPath" />.
             </summary>
             <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1402,7 +1657,7 @@
             on the specified <paramref name="address" />, <paramref name="port" />, <paramref name="absPath" /> and <paramref name="secure" />.
             </summary>
             <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1438,17 +1693,17 @@
             A <see cref="T:WebSocketSharp.WebSocket" /> to bind.
             </param>
         </member>
-        <member name="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(System.Net.Sockets.TcpClient)">
+        <member name="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">
             <summary>
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </summary>
-            <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains the TCP connection.
+            <param name="context">
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </param>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadcast(System.String)">
             <summary>
-            Broadcasts the specified <see cref="T:System.String" />.
+            Broadcasts the specified <see cref="T:System.String" /> to all clients.
             </summary>
             <param name="data">
             A <see cref="T:System.String" /> to broadcast.
@@ -1458,6 +1713,10 @@
             <summary>
             Pings with the specified <see cref="T:System.String" /> to all clients.
             </summary>
+            <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of the session ID and value
+            indicating whether the server received a Pong in a time.
+            </returns>
             <param name="message">
             A <see cref="T:System.String" /> that contains a message.
             </param>
diff --git a/websocket-sharp/doc/doc.sh b/websocket-sharp/doc/doc.sh
index 1730100a..e4f3fa6b 100755
--- a/websocket-sharp/doc/doc.sh
+++ b/websocket-sharp/doc/doc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# @(#) doc.sh ver.0.0.1 2013.01.11
+# @(#) doc.sh ver.0.0.2 2013.01.24
 #
 # Usage:
 #   doc.sh
@@ -27,5 +27,5 @@ createDir() {
 set -e
 createDir ${MDOC_DIR}
 createDir ${HTML_DIR}
-mdoc update -fno-assembly-versions -i ${XML} -o ${MDOC_DIR}/ ${DLL}
+mdoc update --delete -fno-assembly-versions -i ${XML} -o ${MDOC_DIR}/ ${DLL}
 mdoc export-html -o ${HTML_DIR}/ ${MDOC_DIR}/
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html
index 54dd0397..1db08742 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html
@@ -216,7 +216,7 @@
     <div class="Remarks" id="T:WebSocketSharp.Server.WebSocketServer:Docs">
       <h2 class="Section">Remarks</h2>
       <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketServer:Docs:Remarks">
-            The WebSocketServer class provides multi WebSocket service.
+            The WebSocketServer class provides the multi WebSocket service.
             </div>
       <h2 class="Section">Requirements</h2>
       <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketServer:Docs:Version Information">
@@ -243,7 +243,7 @@
                     </b>()</div>
                 </td>
                 <td>
-            Initializes a new instance of the WebSocketServer class.
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class.
             </td>
               </tr>
               <tr valign="top">
@@ -258,7 +258,7 @@
                     </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)</div>
                 </td>
                 <td>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>port</i>.
             </td>
               </tr>
@@ -274,7 +274,7 @@
                     </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)</div>
                 </td>
                 <td>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified WebSocket URL.
             </td>
               </tr>
@@ -290,7 +290,7 @@
                     </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>)</div>
                 </td>
                 <td>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>port</i> and <i>secure</i>.
             </td>
               </tr>
@@ -306,7 +306,7 @@
                     </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)</div>
                 </td>
                 <td>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>address</i> and <i>port</i>.
             </td>
               </tr>
@@ -322,7 +322,7 @@
                     </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>)</div>
                 </td>
                 <td>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>address</i>, <i>port</i> and <i>secure</i>.
             </td>
               </tr>
@@ -344,7 +344,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a>
                   </i>. 
-            Gets the local IP address on which to listen for incoming connection attempts.
+            Gets the IP address on which to listen for incoming connection attempts.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</td>
               </tr>
               <tr valign="top">
@@ -358,7 +358,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
                   </i>. 
-            Gets a value indicating whether this server is secure.
+            Gets a value indicating whether this server provides secure connection.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</td>
               </tr>
               <tr valign="top">
@@ -393,14 +393,14 @@
                 <td>[read-only]<div></div></td>
                 <td>
                   <b>
-                    <a href="#P:WebSocketSharp.Server.WebSocketServer.ServicePath">ServicePath</a>
+                    <a href="#P:WebSocketSharp.Server.WebSocketServer.ServicePaths">ServicePaths</a>
                   </b>
                 </td>
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.IEnumerable`1">IEnumerable&lt;string&gt;</a>
                   </i>. 
-            Gets the service paths.
+            Gets the paths associated with the each WebSocket services.
             </td>
               </tr>
               <tr valign="top">
@@ -460,7 +460,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketServer.AddService``1(System.String)">AddService&lt;T&gt;</a>
                   </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
-            Adds the WebSocket service.
+            Adds a WebSocket service.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -472,7 +472,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketServer.Broadcast(System.String)">Broadcast</a>
                   </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
-            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -523,9 +523,9 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a>)<blockquote>
-            Accepts the WebSocket connection.
+                    <a href="#M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket</a>
+                  </b>(<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a>)<blockquote>
+            Accepts a WebSocket connection.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -534,9 +534,9 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="../WebSocketSharp.Server/WebSocketServerBase.html#M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a>)<blockquote>
-            Accepts the WebSocket connection.
+                    <a href="../WebSocketSharp.Server/WebSocketServerBase.html#M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket</a>
+                  </b>(<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a>)<blockquote>
+            Accepts a WebSocket connection.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</blockquote></td>
               </tr>
               <tr valign="top">
@@ -548,7 +548,7 @@
                   <b>
                     <a href="../WebSocketSharp.Server/WebSocketServerBase.html#M:WebSocketSharp.Server.WebSocketServerBase.Error(System.String)">Error</a>
                   </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
-            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <i>message</i>.
+            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</blockquote></td>
               </tr>
             </table>
@@ -613,7 +613,7 @@
         <h3 id="C:WebSocketSharp.Server.WebSocketServer">WebSocketServer Constructor</h3>
         <blockquote id="C:WebSocketSharp.Server.WebSocketServer:member">
           <p class="Summary">
-            Initializes a new instance of the WebSocketServer class.
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public  <b>WebSocketServer</b> ()</div>
@@ -629,7 +629,7 @@
         <h3 id="C:WebSocketSharp.Server.WebSocketServer(System.Int32)">WebSocketServer Constructor</h3>
         <blockquote id="C:WebSocketSharp.Server.WebSocketServer(System.Int32):member">
           <p class="Summary">
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>port</i>.
             </p>
           <h2>Syntax</h2>
@@ -657,7 +657,7 @@
         <h3 id="C:WebSocketSharp.Server.WebSocketServer(System.String)">WebSocketServer Constructor</h3>
         <blockquote id="C:WebSocketSharp.Server.WebSocketServer(System.String):member">
           <p class="Summary">
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified WebSocket URL.
             </p>
           <h2>Syntax</h2>
@@ -685,7 +685,7 @@
         <h3 id="C:WebSocketSharp.Server.WebSocketServer(System.Int32,System.Boolean)">WebSocketServer Constructor</h3>
         <blockquote id="C:WebSocketSharp.Server.WebSocketServer(System.Int32,System.Boolean):member">
           <p class="Summary">
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>port</i> and <i>secure</i>.
             </p>
           <h2>Syntax</h2>
@@ -719,7 +719,7 @@
         <h3 id="C:WebSocketSharp.Server.WebSocketServer(System.Net.IPAddress,System.Int32)">WebSocketServer Constructor</h3>
         <blockquote id="C:WebSocketSharp.Server.WebSocketServer(System.Net.IPAddress,System.Int32):member">
           <p class="Summary">
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>address</i> and <i>port</i>.
             </p>
           <h2>Syntax</h2>
@@ -731,7 +731,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
             </dd>
               <dt>
                 <i>port</i>
@@ -753,7 +753,7 @@
         <h3 id="C:WebSocketSharp.Server.WebSocketServer(System.Net.IPAddress,System.Int32,System.Boolean)">WebSocketServer Constructor</h3>
         <blockquote id="C:WebSocketSharp.Server.WebSocketServer(System.Net.IPAddress,System.Int32,System.Boolean):member">
           <p class="Summary">
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketServer.html">WebSocketSharp.Server.WebSocketServer</a> class that listens for incoming connection attempts
             on the specified <i>address</i>, <i>port</i> and <i>secure</i>.
             </p>
           <h2>Syntax</h2>
@@ -765,7 +765,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
             </dd>
               <dt>
                 <i>port</i>
@@ -790,37 +790,37 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(System.Net.Sockets.TcpClient):member">
+        <h3 id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):member">
           <p class="Summary">
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </p>
           <h2>Syntax</h2>
-          <div class="Signature">protected override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AcceptWebSocket</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> client)</div>
+          <div class="Signature">protected override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AcceptWebSocket</b> (<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> context)</div>
           <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(System.Net.Sockets.TcpClient):Parameters">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Parameters">
             <dl>
               <dt>
-                <i>client</i>
+                <i>context</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> that contains the TCP connection.
+            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains a WebSocket connection.
             </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(System.Net.Sockets.TcpClient):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(System.Net.Sockets.TcpClient):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
         <h3 id="M:WebSocketSharp.Server.WebSocketServer.AddService``1(System.String)">AddService&lt;T&gt; Generic Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketServer.AddService``1(System.String):member">
           <p class="Summary">
-            Adds the WebSocket service.
+            Adds a WebSocket service.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AddService&lt;T&gt;</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> absPath)<br /> where T : <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a>, new()</div>
@@ -831,7 +831,7 @@
                 <i>T</i>
               </dt>
               <dd>
-            The type of the WebSocket service. The T must inherit the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> class.
+            The type of a WebSocket service. The T must inherit the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> class.
             </dd>
             </dl>
           </blockquote>
@@ -842,7 +842,7 @@
                 <i>absPath</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an absolute path associated with the WebSocket service.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an absolute path associated with a WebSocket service.
             </dd>
             </dl>
           </blockquote>
@@ -858,7 +858,7 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketServer.Broadcast(System.String)">Broadcast Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketServer.Broadcast(System.String):member">
           <p class="Summary">
-            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Broadcast</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> data)</div>
@@ -882,23 +882,23 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="P:WebSocketSharp.Server.WebSocketServer.ServicePath">ServicePath Property</h3>
-        <blockquote id="P:WebSocketSharp.Server.WebSocketServer.ServicePath:member">
+        <h3 id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths">ServicePaths Property</h3>
+        <blockquote id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths:member">
           <p class="Summary">
-            Gets the service paths.
+            Gets the paths associated with the each WebSocket services.
             </p>
           <h2>Syntax</h2>
-          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.IEnumerable`1">IEnumerable&lt;string&gt;</a> <b>ServicePath</b>  { get; }</div>
+          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.IEnumerable`1">IEnumerable&lt;string&gt;</a> <b>ServicePaths</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
-          <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePath:Value">
-            An IEnumerable&lt;string&gt; that contains the service paths.
+          <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths:Value">
+            An IEnumerable&lt;string&gt; that contains the paths.
             </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePath:Remarks">
+          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePath:Version Information">
+          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths:Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServerBase.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServerBase.html
index 761ff628..58472219 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServerBase.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServerBase.html
@@ -296,7 +296,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a>
                   </i>. 
-            Gets the local IP address on which to listen for incoming connection attempts.
+            Gets the IP address on which to listen for incoming connection attempts.
             </td>
               </tr>
               <tr valign="top">
@@ -310,7 +310,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
                   </i>. 
-            Gets a value indicating whether this server is secure.
+            Gets a value indicating whether this server provides secure connection.
             </td>
               </tr>
               <tr valign="top">
@@ -409,9 +409,9 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a>)<blockquote>
-            Accepts the WebSocket connection.
+                    <a href="#M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket</a>
+                  </b>(<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a>)<blockquote>
+            Accepts a WebSocket connection.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -423,7 +423,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketServerBase.Error(System.String)">Error</a>
                   </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
-            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <i>message</i>.
+            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
             </blockquote></td>
               </tr>
             </table>
@@ -569,7 +569,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains a local IP address.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
             </dd>
               <dt>
                 <i>port</i>
@@ -581,7 +581,7 @@
                 <i>absPath</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a absolute path.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an absolute path.
             </dd>
               <dt>
                 <i>secure</i>
@@ -633,43 +633,43 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient):member">
+        <h3 id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):member">
           <p class="Summary">
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </p>
           <h2>Syntax</h2>
-          <div class="Signature">protected abstract <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AcceptWebSocket</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> client)</div>
+          <div class="Signature">protected abstract <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AcceptWebSocket</b> (<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> context)</div>
           <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient):Parameters">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Parameters">
             <dl>
               <dt>
-                <i>client</i>
+                <i>context</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> that contains the WebSocket connection.
+            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains a WebSocket connection.
             </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
         <h3 id="P:WebSocketSharp.Server.WebSocketServerBase.Address">Address Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketServerBase.Address:member">
           <p class="Summary">
-            Gets the local IP address on which to listen for incoming connection attempts.
+            Gets the IP address on which to listen for incoming connection attempts.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> <b>Address</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.Address:Value">
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains a local IP address.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.Address:Remarks">
@@ -703,7 +703,7 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketServerBase.Error(System.String)">Error Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketServerBase.Error(System.String):member">
           <p class="Summary">
-            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <i>message</i>.
+            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Error</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> message)</div>
@@ -730,13 +730,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketServerBase.IsSecure">IsSecure Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketServerBase.IsSecure:member">
           <p class="Summary">
-            Gets a value indicating whether this server is secure.
+            Gets a value indicating whether this server provides secure connection.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>IsSecure</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.IsSecure:Value">
-            <tt>true</tt> if this server is secure; otherwise, <tt>false</tt>.
+            <tt>true</tt> if this server provides secure connection; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.IsSecure:Remarks">
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html
index ed5c0094..9d583ec0 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html
@@ -207,8 +207,8 @@
     </div>
     <h1 class="PageTitle" id="T:WebSocketSharp.Server.WebSocketService">WebSocketService  Class</h1>
     <p class="Summary" id="T:WebSocketSharp.Server.WebSocketService:Summary">
-      <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-    </p>
+            Provides the basic functions of the WebSocket service.
+            </p>
     <div id="T:WebSocketSharp.Server.WebSocketService:Signature">
       <h2>Syntax</h2>
       <div class="Signature">public abstract class  <b>WebSocketService</b></div>
@@ -216,8 +216,8 @@
     <div class="Remarks" id="T:WebSocketSharp.Server.WebSocketService:Docs">
       <h2 class="Section">Remarks</h2>
       <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketService:Docs:Remarks">
-        <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-      </div>
+            The WebSocketService class is an abstract class.
+            </div>
       <h2 class="Section">Requirements</h2>
       <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketService:Docs:Version Information">
         <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
@@ -243,8 +243,8 @@
                     </b>()</div>
                 </td>
                 <td>
-                  <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-                </td>
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> class.
+            </td>
               </tr>
             </table>
           </div>
@@ -263,7 +263,9 @@
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets the ID of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </td>
               </tr>
               <tr valign="top">
                 <td>[read-only]<div></div></td>
@@ -275,7 +277,9 @@
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets a value indicating whether a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance is bound to a <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a>.
+            </td>
               </tr>
             </table>
           </div>
@@ -294,7 +298,9 @@
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Specialized.NameValueCollection">System.Collections.Specialized.NameValueCollection</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets the HTTP query string variables used in the WebSocket opening handshake.
+            </td>
               </tr>
               <tr valign="top">
                 <td>[read-only]<div></div></td>
@@ -306,7 +312,9 @@
                 <td>
                   <i>
                     <a href="../WebSocketSharp.Server/SessionManager.html">SessionManager</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets the sessions to the WebSocket service.
+            </td>
               </tr>
             </table>
           </div>
@@ -323,7 +331,10 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Bind(WebSocketSharp.WebSocket,WebSocketSharp.Server.SessionManager)">Bind</a>
-                  </b>(<a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a>, <a href="../WebSocketSharp.Server/SessionManager.html">SessionManager</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a>, <a href="../WebSocketSharp.Server/SessionManager.html">SessionManager</a>)<blockquote>
+            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> and <a href="../WebSocketSharp.Server/SessionManager.html">WebSocketSharp.Server.SessionManager</a>
+            to a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -332,8 +343,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.Ping">Ping</a>
-                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.Broadcast(System.Byte[])">Broadcast</a>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[])<blockquote>
+            Broadcasts the specified array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> to all clients of the WebSocket service.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -342,8 +355,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.Ping(System.String)">Ping</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.Broadcast(System.String)">Broadcast</a>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients of the WebSocket service.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -352,8 +367,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.PingAround">PingAround</a>
-                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.Broadping">Broadping</a>
+                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a></nobr><blockquote>
+            Pings to all clients of the WebSocket service.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -362,8 +379,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.PingAround(System.String)">PingAround</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.Broadping(System.String)">Broadping</a>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a></nobr><blockquote>
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients of the WebSocket service.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -372,8 +391,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.PingTo(System.String)">PingTo</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.Ping">Ping</a>
+                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -382,8 +403,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String)">PingTo</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.Ping(System.String)">Ping</a>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -392,8 +415,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.Publish(System.Byte[])">Publish</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[])<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.PingTo(System.String)">PingTo</a>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -402,8 +427,11 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.Publish(System.String)">Publish</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String)">PingTo</a>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified ID.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -413,7 +441,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Send(System.Byte[])">Send</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[])<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[])<blockquote>
+            Sends a binary data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -423,7 +453,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Send(System.String)">Send</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Sends a text data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -433,7 +465,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.Byte[])">SendTo</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[])<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[])<blockquote>
+            Sends a binary data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -443,7 +477,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.String)">SendTo</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Sends a text data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -453,7 +489,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Start">Start</a>
-                  </b>()<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>()<blockquote>
+            Starts a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -463,7 +501,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Stop">Stop</a>
-                  </b>()<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>()<blockquote>
+            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -473,7 +513,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Stop(System.UInt16,System.String)">Stop</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.UInt16">ushort</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.UInt16">ushort</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.UInt16">ushort</a> and <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -483,7 +525,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Stop(WebSocketSharp.CloseStatusCode,System.String)">Stop</a>
-                  </b>(<a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance with the specified <a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a> and <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            </blockquote></td>
               </tr>
             </table>
           </div>
@@ -499,8 +543,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnClose(System.Object,WebSocketSharp.CloseEventArgs)">OnClose</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a>, <a href="../WebSocketSharp/CloseEventArgs.html">WebSocketSharp.CloseEventArgs</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnClose(WebSocketSharp.CloseEventArgs)">OnClose</a>
+                  </b>(<a href="../WebSocketSharp/CloseEventArgs.html">WebSocketSharp.CloseEventArgs</a>)<blockquote>
+            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> receives a Close frame or the Stop method is called.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -509,8 +555,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnError(System.Object,WebSocketSharp.ErrorEventArgs)">OnError</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a>, <a href="../WebSocketSharp/ErrorEventArgs.html">WebSocketSharp.ErrorEventArgs</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs)">OnError</a>
+                  </b>(<a href="../WebSocketSharp/ErrorEventArgs.html">WebSocketSharp.ErrorEventArgs</a>)<blockquote>
+            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> gets an error.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -519,8 +567,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnMessage(System.Object,WebSocketSharp.MessageEventArgs)">OnMessage</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a>, <a href="../WebSocketSharp/MessageEventArgs.html">WebSocketSharp.MessageEventArgs</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs)">OnMessage</a>
+                  </b>(<a href="../WebSocketSharp/MessageEventArgs.html">WebSocketSharp.MessageEventArgs</a>)<blockquote>
+            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> receives a data frame.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -529,8 +579,10 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnOpen(System.Object,System.EventArgs)">OnOpen</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.EventArgs">EventArgs</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                    <a href="#M:WebSocketSharp.Server.WebSocketService.OnOpen">OnOpen</a>
+                  </b>()<blockquote>
+            Occurs when the WebSocket connection has been established.
+            </blockquote></td>
               </tr>
             </table>
           </div>
@@ -573,8 +625,8 @@
         <h3 id="C:WebSocketSharp.Server.WebSocketService">WebSocketService Constructor</h3>
         <blockquote id="C:WebSocketSharp.Server.WebSocketService:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Initializes a new instance of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> class.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public  <b>WebSocketService</b> ()</div>
           <h2 class="Section">Remarks</h2>
@@ -589,8 +641,9 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Bind(WebSocketSharp.WebSocket,WebSocketSharp.Server.SessionManager)">Bind Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Bind(WebSocketSharp.WebSocket,WebSocketSharp.Server.SessionManager):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> and <a href="../WebSocketSharp.Server/SessionManager.html">WebSocketSharp.Server.SessionManager</a>
+            to a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Bind</b> (<a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> socket, <a href="../WebSocketSharp.Server/SessionManager.html">SessionManager</a> sessions)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -600,14 +653,14 @@
                 <i>socket</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to bind to the WebSocketService.
+            </dd>
               <dt>
                 <i>sessions</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="../WebSocketSharp.Server/SessionManager.html">WebSocketSharp.Server.SessionManager</a> to bind to the WebSocketService.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -619,17 +672,124 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.Byte[])">Broadcast Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.Byte[]):member">
+          <p class="Summary">
+            Broadcasts the specified array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> to all clients of the WebSocket service.
+            </p>
+          <h2>Syntax</h2>
+          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Broadcast</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[] data)</div>
+          <h4 class="Subsection">Parameters</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.Byte[]):Parameters">
+            <dl>
+              <dt>
+                <i>data</i>
+              </dt>
+              <dd>
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> to broadcast.
+            </dd>
+            </dl>
+          </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.Byte[]):Remarks">
+            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+          </div>
+          <h2 class="Section">Requirements</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.Byte[]):Version Information">
+            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
+          <hr size="1" />
+        </blockquote>
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.String)">Broadcast Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.String):member">
+          <p class="Summary">
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients of the WebSocket service.
+            </p>
+          <h2>Syntax</h2>
+          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Broadcast</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> data)</div>
+          <h4 class="Subsection">Parameters</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.String):Parameters">
+            <dl>
+              <dt>
+                <i>data</i>
+              </dt>
+              <dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to broadcast.
+            </dd>
+            </dl>
+          </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.String):Remarks">
+            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+          </div>
+          <h2 class="Section">Requirements</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadcast(System.String):Version Information">
+            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
+          <hr size="1" />
+        </blockquote>
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.Broadping">Broadping Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.Broadping:member">
+          <p class="Summary">
+            Pings to all clients of the WebSocket service.
+            </p>
+          <h2>Syntax</h2>
+          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a> <b>Broadping</b> ()</div>
+          <h4 class="Subsection">Returns</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping:Returns">
+            A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+            indicating whether the WebSocket service received a Pong in a time.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping:Remarks">
+            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+          </div>
+          <h2 class="Section">Requirements</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping:Version Information">
+            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
+          <hr size="1" />
+        </blockquote>
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String)">Broadping Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String):member">
+          <p class="Summary">
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients of the WebSocket service.
+            </p>
+          <h2>Syntax</h2>
+          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a> <b>Broadping</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> message)</div>
+          <h4 class="Subsection">Parameters</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String):Parameters">
+            <dl>
+              <dt>
+                <i>message</i>
+              </dt>
+              <dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a message.
+            </dd>
+            </dl>
+          </blockquote>
+          <h4 class="Subsection">Returns</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String):Returns">
+            A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+            indicating whether the WebSocket service received a Pong in a time.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String):Remarks">
+            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+          </div>
+          <h2 class="Section">Requirements</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String):Version Information">
+            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
+          <hr size="1" />
+        </blockquote>
         <h3 id="P:WebSocketSharp.Server.WebSocketService.ID">ID Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketService.ID:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets the ID of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>ID</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketService.ID:Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a ID.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketService.ID:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -642,14 +802,14 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketService.IsBound">IsBound Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketService.IsBound:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets a value indicating whether a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance is bound to a <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>IsBound</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketService.IsBound:Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            <tt>true</tt> if the WebSocketService is bound to a WebSocket; otherwise, <tt>false</tt>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketService.IsBound:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -659,149 +819,114 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnClose(System.Object,WebSocketSharp.CloseEventArgs)">OnClose Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnClose(System.Object,WebSocketSharp.CloseEventArgs):member">
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnClose(WebSocketSharp.CloseEventArgs)">OnClose Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnClose(WebSocketSharp.CloseEventArgs):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> receives a Close frame or the Stop method is called.
+            </p>
           <h2>Syntax</h2>
-          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnClose</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a> sender, <a href="../WebSocketSharp/CloseEventArgs.html">WebSocketSharp.CloseEventArgs</a> e)</div>
+          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnClose</b> (<a href="../WebSocketSharp/CloseEventArgs.html">WebSocketSharp.CloseEventArgs</a> e)</div>
           <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnClose(System.Object,WebSocketSharp.CloseEventArgs):Parameters">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnClose(WebSocketSharp.CloseEventArgs):Parameters">
             <dl>
-              <dt>
-                <i>sender</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
               <dt>
                 <i>e</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="../WebSocketSharp/CloseEventArgs.html">WebSocketSharp.CloseEventArgs</a> that contains the event data associated with a <a href="../WebSocketSharp/WebSocket.html#E:WebSocketSharp.WebSocket.OnClose">WebSocketSharp.WebSocket.OnClose</a> event.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnClose(System.Object,WebSocketSharp.CloseEventArgs):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnClose(WebSocketSharp.CloseEventArgs):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnClose(System.Object,WebSocketSharp.CloseEventArgs):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnClose(WebSocketSharp.CloseEventArgs):Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnError(System.Object,WebSocketSharp.ErrorEventArgs)">OnError Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnError(System.Object,WebSocketSharp.ErrorEventArgs):member">
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs)">OnError Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> gets an error.
+            </p>
           <h2>Syntax</h2>
-          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnError</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a> sender, <a href="../WebSocketSharp/ErrorEventArgs.html">WebSocketSharp.ErrorEventArgs</a> e)</div>
+          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnError</b> (<a href="../WebSocketSharp/ErrorEventArgs.html">WebSocketSharp.ErrorEventArgs</a> e)</div>
           <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnError(System.Object,WebSocketSharp.ErrorEventArgs):Parameters">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs):Parameters">
             <dl>
-              <dt>
-                <i>sender</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
               <dt>
                 <i>e</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            An <a href="../WebSocketSharp/ErrorEventArgs.html">WebSocketSharp.ErrorEventArgs</a> that contains the event data associated with a <a href="../WebSocketSharp/WebSocket.html#E:WebSocketSharp.WebSocket.OnError">WebSocketSharp.WebSocket.OnError</a> event.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnError(System.Object,WebSocketSharp.ErrorEventArgs):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnError(System.Object,WebSocketSharp.ErrorEventArgs):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs):Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnMessage(System.Object,WebSocketSharp.MessageEventArgs)">OnMessage Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnMessage(System.Object,WebSocketSharp.MessageEventArgs):member">
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs)">OnMessage Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> receives a data frame.
+            </p>
           <h2>Syntax</h2>
-          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnMessage</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a> sender, <a href="../WebSocketSharp/MessageEventArgs.html">WebSocketSharp.MessageEventArgs</a> e)</div>
+          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnMessage</b> (<a href="../WebSocketSharp/MessageEventArgs.html">WebSocketSharp.MessageEventArgs</a> e)</div>
           <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnMessage(System.Object,WebSocketSharp.MessageEventArgs):Parameters">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs):Parameters">
             <dl>
-              <dt>
-                <i>sender</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
               <dt>
                 <i>e</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="../WebSocketSharp/MessageEventArgs.html">WebSocketSharp.MessageEventArgs</a> that contains the event data associated with a <a href="../WebSocketSharp/WebSocket.html#E:WebSocketSharp.WebSocket.OnMessage">WebSocketSharp.WebSocket.OnMessage</a> event.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnMessage(System.Object,WebSocketSharp.MessageEventArgs):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnMessage(System.Object,WebSocketSharp.MessageEventArgs):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs):Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnOpen(System.Object,System.EventArgs)">OnOpen Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnOpen(System.Object,System.EventArgs):member">
+        <h3 id="M:WebSocketSharp.Server.WebSocketService.OnOpen">OnOpen Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketService.OnOpen:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Occurs when the WebSocket connection has been established.
+            </p>
           <h2>Syntax</h2>
-          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnOpen</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a> sender, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.EventArgs">EventArgs</a> e)</div>
-          <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnOpen(System.Object,System.EventArgs):Parameters">
-            <dl>
-              <dt>
-                <i>sender</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
-              <dt>
-                <i>e</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
-            </dl>
-          </blockquote>
+          <div class="Signature">protected virtual <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnOpen</b> ()</div>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnOpen(System.Object,System.EventArgs):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnOpen:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnOpen(System.Object,System.EventArgs):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.OnOpen:Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Ping">Ping Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Ping:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>Ping</b> ()</div>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Ping:Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            <tt>true</tt> if the WebSocketService receives a Pong in a time; otherwise, <tt>false</tt>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Ping:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -814,8 +939,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Ping(System.String)">Ping Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Ping(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>Ping</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> message)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -825,14 +950,14 @@
                 <i>message</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a message.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Ping(System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            <tt>true</tt> if the WebSocketService receives a Pong in a time; otherwise, <tt>false</tt>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Ping(System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -842,62 +967,11 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.PingAround">PingAround Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.PingAround:member">
-          <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
-          <h2>Syntax</h2>
-          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a> <b>PingAround</b> ()</div>
-          <h4 class="Subsection">Returns</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingAround:Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
-          <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingAround:Remarks">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </div>
-          <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingAround:Version Information">
-            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
-          <hr size="1" />
-        </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.PingAround(System.String)">PingAround Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.PingAround(System.String):member">
-          <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
-          <h2>Syntax</h2>
-          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Generic.Dictionary`2">Dictionary&lt;string, bool&gt;</a> <b>PingAround</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> message)</div>
-          <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingAround(System.String):Parameters">
-            <dl>
-              <dt>
-                <i>message</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
-            </dl>
-          </blockquote>
-          <h4 class="Subsection">Returns</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingAround(System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
-          <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingAround(System.String):Remarks">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </div>
-          <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingAround(System.String):Version Information">
-            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
-          <hr size="1" />
-        </blockquote>
         <h3 id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String)">PingTo Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>PingTo</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> id)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -907,14 +981,14 @@
                 <i>id</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a ID that represents the destination for the Ping.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            <tt>true</tt> if the WebSocket service receives a Pong in a time; otherwise, <tt>false</tt>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -927,8 +1001,9 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String)">PingTo Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified ID.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>PingTo</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> id, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> message)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -938,20 +1013,20 @@
                 <i>id</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a ID that represents the destination for the Ping.
+            </dd>
               <dt>
                 <i>message</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a message.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            <tt>true</tt> if the WebSocketService receives a Pong in a time; otherwise, <tt>false</tt>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -961,71 +1036,17 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.Publish(System.Byte[])">Publish Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.Publish(System.Byte[]):member">
-          <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
-          <h2>Syntax</h2>
-          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Publish</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[] data)</div>
-          <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Publish(System.Byte[]):Parameters">
-            <dl>
-              <dt>
-                <i>data</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
-            </dl>
-          </blockquote>
-          <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Publish(System.Byte[]):Remarks">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </div>
-          <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Publish(System.Byte[]):Version Information">
-            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
-          <hr size="1" />
-        </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketService.Publish(System.String)">Publish Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketService.Publish(System.String):member">
-          <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
-          <h2>Syntax</h2>
-          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Publish</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> data)</div>
-          <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Publish(System.String):Parameters">
-            <dl>
-              <dt>
-                <i>data</i>
-              </dt>
-              <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
-            </dl>
-          </blockquote>
-          <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Publish(System.String):Remarks">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </div>
-          <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Publish(System.String):Version Information">
-            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
-          <hr size="1" />
-        </blockquote>
         <h3 id="P:WebSocketSharp.Server.WebSocketService.QueryString">QueryString Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketService.QueryString:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets the HTTP query string variables used in the WebSocket opening handshake.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">protected <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Specialized.NameValueCollection">System.Collections.Specialized.NameValueCollection</a> <b>QueryString</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketService.QueryString:Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Specialized.NameValueCollection">System.Collections.Specialized.NameValueCollection</a> that contains the query string variables.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketService.QueryString:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1038,8 +1059,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Send(System.Byte[])">Send Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Send(System.Byte[]):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Sends a binary data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Send</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[] data)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1049,8 +1070,8 @@
                 <i>data</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> that contains a binary data to send.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1065,8 +1086,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Send(System.String)">Send Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Send(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Sends a text data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Send</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> data)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1076,8 +1097,8 @@
                 <i>data</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a text data to send.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1092,8 +1113,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.Byte[])">SendTo Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.Byte[]):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Sends a binary data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>SendTo</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> id, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[] data)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1103,14 +1124,14 @@
                 <i>id</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a ID that represents the destination for the data.
+            </dd>
               <dt>
                 <i>data</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> that contains a binary data to send.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1125,8 +1146,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.String)">SendTo Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.SendTo(System.String,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Sends a text data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>SendTo</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> id, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> data)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1136,14 +1157,14 @@
                 <i>id</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a ID that represents the destination for the data.
+            </dd>
               <dt>
                 <i>data</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a text data to send.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1158,14 +1179,14 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketService.Sessions">Sessions Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketService.Sessions:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets the sessions to the WebSocket service.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">protected <a href="../WebSocketSharp.Server/SessionManager.html">SessionManager</a> <b>Sessions</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketService.Sessions:Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="../WebSocketSharp.Server/SessionManager.html">WebSocketSharp.Server.SessionManager</a> that contains the sessions to the WebSocket service.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketService.Sessions:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1178,8 +1199,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Start">Start Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Start:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Starts a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Start</b> ()</div>
           <h2 class="Section">Remarks</h2>
@@ -1194,8 +1215,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Stop">Stop Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Stop:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Stop</b> ()</div>
           <h2 class="Section">Remarks</h2>
@@ -1210,8 +1231,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Stop(System.UInt16,System.String)">Stop Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Stop(System.UInt16,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.UInt16">ushort</a> and <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Stop</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.UInt16">ushort</a> code, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> reason)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1221,14 +1242,14 @@
                 <i>code</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.UInt16">ushort</a> that contains a status code indicating the reason for stop.
+            </dd>
               <dt>
                 <i>reason</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a reason for stop.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1243,8 +1264,8 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Stop(WebSocketSharp.CloseStatusCode,System.String)">Stop Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Stop(WebSocketSharp.CloseStatusCode,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance with the specified <a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a> and <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Stop</b> (<a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a> code, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> reason)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1254,14 +1275,14 @@
                 <i>code</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            One of the <a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a> values that contains a status code indicating the reason for stop.
+            </dd>
               <dt>
                 <i>reason</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a reason for stop.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html
index 0019fb00..0f706268 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html
@@ -227,7 +227,7 @@
       </blockquote>
       <h2 class="Section">Remarks</h2>
       <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketServiceHost`1:Docs:Remarks">
-            The WebSocketServiceHost&lt;T&gt; class provides single WebSocket service.
+            The WebSocketServiceHost&lt;T&gt; class provides the single WebSocket service.
             </div>
       <h2 class="Section">Requirements</h2>
       <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketServiceHost`1:Docs:Version Information">
@@ -372,7 +372,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a>
                   </i>. 
-            Gets the local IP address on which to listen for incoming connection attempts.
+            Gets the IP address on which to listen for incoming connection attempts.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</td>
               </tr>
               <tr valign="top">
@@ -386,7 +386,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
                   </i>. 
-            Gets a value indicating whether this server is secure.
+            Gets a value indicating whether this server provides secure connection.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</td>
               </tr>
               <tr valign="top">
@@ -488,7 +488,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadcast(System.String)">Broadcast</a>
                   </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
-            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -551,9 +551,9 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a>)<blockquote>
-            Accepts the WebSocket connection.
+                    <a href="#M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket</a>
+                  </b>(<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a>)<blockquote>
+            Accepts a WebSocket connection.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -562,9 +562,9 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="../WebSocketSharp.Server/WebSocketServerBase.html#M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a>)<blockquote>
-            Accepts the WebSocket connection.
+                    <a href="../WebSocketSharp.Server/WebSocketServerBase.html#M:WebSocketSharp.Server.WebSocketServerBase.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket</a>
+                  </b>(<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a>)<blockquote>
+            Accepts a WebSocket connection.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</blockquote></td>
               </tr>
               <tr valign="top">
@@ -576,7 +576,7 @@
                   <b>
                     <a href="../WebSocketSharp.Server/WebSocketServerBase.html#M:WebSocketSharp.Server.WebSocketServerBase.Error(System.String)">Error</a>
                   </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
-            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <i>message</i>.
+            Occurs the <a href="../WebSocketSharp.Server/WebSocketServerBase.html#E:WebSocketSharp.Server.WebSocketServerBase.OnError">WebSocketServerBase.OnError</a> event with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</blockquote></td>
               </tr>
             </table>
@@ -838,7 +838,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
             </dd>
               <dt>
                 <i>port</i>
@@ -878,7 +878,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> that contains an IP address.
             </dd>
               <dt>
                 <i>port</i>
@@ -909,37 +909,37 @@
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(System.Net.Sockets.TcpClient)">AcceptWebSocket Method</h3>
-        <blockquote id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(System.Net.Sockets.TcpClient):member">
+        <h3 id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">AcceptWebSocket Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):member">
           <p class="Summary">
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </p>
           <h2>Syntax</h2>
-          <div class="Signature">protected override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AcceptWebSocket</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> client)</div>
+          <div class="Signature">protected override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AcceptWebSocket</b> (<a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> context)</div>
           <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(System.Net.Sockets.TcpClient):Parameters">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Parameters">
             <dl>
               <dt>
-                <i>client</i>
+                <i>context</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> that contains the TCP connection.
+            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains a WebSocket connection.
             </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(System.Net.Sockets.TcpClient):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(System.Net.Sockets.TcpClient):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext):Version Information">
             <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
         <h3 id="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadcast(System.String)">Broadcast Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadcast(System.String):member">
           <p class="Summary">
-            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>.
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to all clients.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Broadcast</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> data)</div>
@@ -983,8 +983,9 @@
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadping(System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A Dictionary&lt;string, bool&gt; that contains the collection of the session ID and value
+            indicating whether the server received a Pong in a time.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadping(System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/index.html b/websocket-sharp/doc/html/WebSocketSharp.Server/index.html
index 57a39a92..40222c13 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/index.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/index.html
@@ -263,8 +263,8 @@
             <a href="./WebSocketService.html">WebSocketService</a>
           </td>
           <td>
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </td>
+            Provides the basic functions of the WebSocket service.
+            </td>
         </tr>
         <tr valign="top">
           <td>
diff --git a/websocket-sharp/doc/html/WebSocketSharp/Ext.html b/websocket-sharp/doc/html/WebSocketSharp/Ext.html
index 4e82527a..82ce2f84 100644
--- a/websocket-sharp/doc/html/WebSocketSharp/Ext.html
+++ b/websocket-sharp/doc/html/WebSocketSharp/Ext.html
@@ -237,9 +237,20 @@
                 </td>
                 <td colspan="2">
                   <b>
-                    <a href="#M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean)">AcceptWebSocket</a>
-                  </b>(<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>)<nobr> : <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a></nobr><blockquote>
-            Accept a WebSocket connection by the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>.
+                    <a href="#M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean)">AcceptWebSocket</a>
+                  </b>(<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>)<nobr> : <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a></nobr><blockquote>
+            Accepts a WebSocket connection by the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>.
+            </blockquote></td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>static </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="#M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext})">AcceptWebSocketAsync</a>
+                  </b>(<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action`1">Action&lt;WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt;</a>)<blockquote>
+            Accepts a WebSocket connection asynchronously by the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -704,21 +715,21 @@
     <div class="Members" id="T:WebSocketSharp.Ext:Members">
       <h2 class="Section" id="MemberDetails">Member Details</h2>
       <div class="SectionBox" id="_MemberDetails">
-        <h3 id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean)">AcceptWebSocket Method</h3>
-        <blockquote id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean):member">
+        <h3 id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean)">AcceptWebSocket Method</h3>
+        <blockquote id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean):member">
           <p class="Summary">
-            Accept a WebSocket connection by the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>.
+            Accepts a WebSocket connection by the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>.
             </p>
           <h2>Syntax</h2>
-          <div class="Signature">public static <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> <b>AcceptWebSocket</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> client, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> secure)</div>
+          <div class="Signature">public static <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> <b>AcceptWebSocket</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a> listener, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> secure)</div>
           <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean):Parameters">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean):Parameters">
             <dl>
               <dt>
-                <i>client</i>
+                <i>listener</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpClient">System.Net.Sockets.TcpClient</a> that contains a TCP connection to accept a WebSocket connection from.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a> that provides a TCP connection to accept a WebSocket connection.
             </dd>
               <dt>
                 <i>secure</i>
@@ -729,11 +740,67 @@
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean):Returns">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean):Returns">
             A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains a WebSocket connection.
             </blockquote>
           <h4 class="Subsection">Exceptions</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean):Exceptions">
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentNullException">ArgumentNullException</a>
+                </td>
+                <td>
+                  <i>listener</i> is <tt>null</tt>.
+            </td>
+              </tr>
+            </table>
+          </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean):Remarks">
+            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+          </div>
+          <h2 class="Section">Requirements</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean):Version Information">
+            <b>Namespace: </b>WebSocketSharp<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
+          <hr size="1" />
+        </blockquote>
+        <h3 id="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext})">AcceptWebSocketAsync Method</h3>
+        <blockquote id="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext}):member">
+          <p class="Summary">
+            Accepts a WebSocket connection asynchronously by the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a>.
+            </p>
+          <h2>Syntax</h2>
+          <div class="Signature">public static <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AcceptWebSocketAsync</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a> listener, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> secure, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action`1">Action&lt;WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt;</a> completed)</div>
+          <h4 class="Subsection">Parameters</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext}):Parameters">
+            <dl>
+              <dt>
+                <i>listener</i>
+              </dt>
+              <dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.Sockets.TcpListener">System.Net.Sockets.TcpListener</a> that provides a TCP connection to accept a WebSocket connection.
+            </dd>
+              <dt>
+                <i>secure</i>
+              </dt>
+              <dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> that indicates a secure connection or not. (<tt>true</tt> indicates a secure connection.)
+            </dd>
+              <dt>
+                <i>completed</i>
+              </dt>
+              <dd>
+            An Action&lt;TcpListenerWebSocketContext&gt; delegate that contains the method(s) that is called when an asynchronous operation completes.
+            </dd>
+            </dl>
+          </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext}):Exceptions">
             <table class="TypeDocumentation">
               <tr>
                 <th>Type</th>
@@ -744,17 +811,17 @@
                   <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentNullException">ArgumentNullException</a>
                 </td>
                 <td>
-            Is thrown when the <i>client</i> parameter passed to a method is invalid because it is <tt>null</tt>.
+                  <i>listener</i> is <tt>null</tt>.
             </td>
               </tr>
             </table>
           </blockquote>
           <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean):Remarks">
+          <div class="SectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext}):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </div>
           <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean):Version Information">
+          <div class="SectionBox" id="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext}):Version Information">
             <b>Namespace: </b>WebSocketSharp<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
diff --git a/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html b/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html
index 14e6f284..7cef1b19 100644
--- a/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html
+++ b/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html
@@ -837,7 +837,7 @@
                 <i>code</i>
               </dt>
               <dd>
-            A <a href="javascript:alert(&quot;Documentation not found.&quot;)">Frame.CloseStatusCode</a> that contains a status code indicating a reason for closure.
+            A <a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a> that contains a status code indicating a reason for closure.
             </dd>
             </dl>
           </blockquote>
@@ -897,7 +897,7 @@
                 <i>code</i>
               </dt>
               <dd>
-            A <a href="javascript:alert(&quot;Documentation not found.&quot;)">Frame.CloseStatusCode</a> that contains a status code indicating a reason for closure.
+            A <a href="../WebSocketSharp/CloseStatusCode.html">WebSocketSharp.CloseStatusCode</a> that contains a status code indicating a reason for closure.
             </dd>
               <dt>
                 <i>reason</i>
@@ -1180,7 +1180,7 @@
                 <i>data</i>
               </dt>
               <dd>
-            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> that contains the binary data to be sent.
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> that contains a binary data to send.
             </dd>
             </dl>
           </blockquote>
@@ -1207,7 +1207,7 @@
                 <i>file</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.IO.FileInfo">System.IO.FileInfo</a> that contains the binary data to be sent.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.IO.FileInfo">System.IO.FileInfo</a> that contains a binary data to send.
             </dd>
             </dl>
           </blockquote>
@@ -1234,7 +1234,7 @@
                 <i>data</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the text data to be sent.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a text data to send.
             </dd>
             </dl>
           </blockquote>
@@ -1261,7 +1261,7 @@
                 <i>data</i>
               </dt>
               <dd>
-            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> that contains the binary data to be sent.
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> that contains a binary data to send.
             </dd>
               <dt>
                 <i>completed</i>
@@ -1294,7 +1294,7 @@
                 <i>file</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.IO.FileInfo">System.IO.FileInfo</a> that contains the binary data to be sent.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.IO.FileInfo">System.IO.FileInfo</a> that contains a binary data to send.
             </dd>
               <dt>
                 <i>completed</i>
@@ -1327,7 +1327,7 @@
                 <i>data</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the text data to be sent.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a text data to send.
             </dd>
               <dt>
                 <i>completed</i>
diff --git a/websocket-sharp/doc/html/index.html b/websocket-sharp/doc/html/index.html
index fcaa3c3e..7c8714bb 100644
--- a/websocket-sharp/doc/html/index.html
+++ b/websocket-sharp/doc/html/index.html
@@ -511,8 +511,8 @@
             <a href="WebSocketSharp.Server/WebSocketService.html">WebSocketService</a>
           </td>
           <td>
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </td>
+            Provides the basic functions of the WebSocket service.
+            </td>
         </tr>
         <tr valign="top">
           <td>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml
index e948664f..c7e6b982 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml
@@ -13,7 +13,7 @@
             Provides the functions of the server that receives the WebSocket connection requests.
             </summary>
     <remarks>
-            The WebSocketServer class provides multi WebSocket service.
+            The WebSocketServer class provides the multi WebSocket service.
             </remarks>
   </Docs>
   <Members>
@@ -24,7 +24,7 @@
       <Parameters />
       <Docs>
         <summary>
-            Initializes a new instance of the WebSocketServer class.
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -41,7 +41,7 @@
             An <see cref="T:System.Int32" /> that contains a port number.
             </param>
         <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="port" />.
             </summary>
         <remarks>To be added.</remarks>
@@ -59,7 +59,7 @@
             A <see cref="T:System.String" /> that contains a WebSocket URL.
             </param>
         <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified WebSocket URL.
             </summary>
         <remarks>To be added.</remarks>
@@ -81,7 +81,7 @@
             A <see cref="T:System.Boolean" /> that indicates providing a secure connection or not. (<c>true</c> indicates providing a secure connection.)
             </param>
         <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="port" /> and <paramref name="secure" />.
             </summary>
         <remarks>To be added.</remarks>
@@ -97,13 +97,13 @@
       </Parameters>
       <Docs>
         <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
             </param>
         <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="address" /> and <paramref name="port" />.
             </summary>
         <remarks>To be added.</remarks>
@@ -120,7 +120,7 @@
       </Parameters>
       <Docs>
         <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -129,28 +129,28 @@
             A <see cref="T:System.Boolean" /> that indicates providing a secure connection or not. (<c>true</c> indicates providing a secure connection.)
             </param>
         <summary>
-            Initializes a new instance of the WebSocketServer class that listens for incoming connection attempts
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketServer" /> class that listens for incoming connection attempts
             on the specified <paramref name="address" />, <paramref name="port" /> and <paramref name="secure" />.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="AcceptWebSocket">
-      <MemberSignature Language="C#" Value="protected override void AcceptWebSocket (System.Net.Sockets.TcpClient client);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void AcceptWebSocket(class System.Net.Sockets.TcpClient client) cil managed" />
+      <MemberSignature Language="C#" Value="protected override void AcceptWebSocket (WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext context);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void AcceptWebSocket(class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext context) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="client" Type="System.Net.Sockets.TcpClient" />
+        <Parameter Name="context" Type="WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" />
       </Parameters>
       <Docs>
-        <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains the TCP connection.
+        <param name="context">
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </param>
         <summary>
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -175,13 +175,13 @@
       </Parameters>
       <Docs>
         <typeparam name="T">
-            The type of the WebSocket service. The T must inherit the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
+            The type of a WebSocket service. The T must inherit the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
             </typeparam>
         <param name="absPath">
-            A <see cref="T:System.String" /> that contains an absolute path associated with the WebSocket service.
+            A <see cref="T:System.String" /> that contains an absolute path associated with a WebSocket service.
             </param>
         <summary>
-            Adds the WebSocket service.
+            Adds a WebSocket service.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -201,24 +201,24 @@
             A <see cref="T:System.String" /> to broadcast.
             </param>
         <summary>
-            Broadcasts the specified <see cref="T:System.String" />.
+            Broadcasts the specified <see cref="T:System.String" /> to all clients.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="ServicePath">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;string&gt; ServicePath { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;string&gt; ServicePath" />
+    <Member MemberName="ServicePaths">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;string&gt; ServicePaths { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;string&gt; ServicePaths" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.Collections.Generic.IEnumerable&lt;System.String&gt;</ReturnType>
       </ReturnValue>
       <Docs>
         <summary>
-            Gets the service paths.
+            Gets the paths associated with the each WebSocket services.
             </summary>
         <value>
-            An IEnumerable&lt;string&gt; that contains the service paths.
+            An IEnumerable&lt;string&gt; that contains the paths.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServerBase.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServerBase.xml
index 60630d04..a539e1af 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServerBase.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServerBase.xml
@@ -65,13 +65,13 @@
       </Parameters>
       <Docs>
         <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
             </param>
         <param name="absPath">
-            A <see cref="T:System.String" /> that contains a absolute path.
+            A <see cref="T:System.String" /> that contains an absolute path.
             </param>
         <param name="secure">
             A <see cref="T:System.Boolean" /> that indicates providing a secure connection or not. (<c>true</c> indicates providing a secure connection.)
@@ -98,21 +98,21 @@
       </Docs>
     </Member>
     <Member MemberName="AcceptWebSocket">
-      <MemberSignature Language="C#" Value="protected abstract void AcceptWebSocket (System.Net.Sockets.TcpClient client);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void AcceptWebSocket(class System.Net.Sockets.TcpClient client) cil managed" />
+      <MemberSignature Language="C#" Value="protected abstract void AcceptWebSocket (WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext context);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void AcceptWebSocket(class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext context) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="client" Type="System.Net.Sockets.TcpClient" />
+        <Parameter Name="context" Type="WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" />
       </Parameters>
       <Docs>
-        <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains the WebSocket connection.
+        <param name="context">
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </param>
         <summary>
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -126,10 +126,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets the local IP address on which to listen for incoming connection attempts.
+            Gets the IP address on which to listen for incoming connection attempts.
             </summary>
         <value>
-            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -166,7 +166,7 @@
             A <see cref="T:System.String" /> that contains an error message.
             </param>
         <summary>
-            Occurs the <see cref="E:WebSocketSharp.Server.WebSocketServerBase.OnError" /> event with the specified <paramref name="message" />.
+            Occurs the <see cref="E:WebSocketSharp.Server.WebSocketServerBase.OnError" /> event with the specified <see cref="T:System.String" />.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -180,10 +180,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets a value indicating whether this server is secure.
+            Gets a value indicating whether this server provides secure connection.
             </summary>
         <value>
-          <c>true</c> if this server is secure; otherwise, <c>false</c>.
+          <c>true</c> if this server provides secure connection; otherwise, <c>false</c>.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketService.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketService.xml
index e4b4e75f..30fd92e0 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketService.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketService.xml
@@ -9,8 +9,12 @@
   </Base>
   <Interfaces />
   <Docs>
-    <summary>To be added.</summary>
-    <remarks>To be added.</remarks>
+    <summary>
+            Provides the basic functions of the WebSocket service.
+            </summary>
+    <remarks>
+            The WebSocketService class is an abstract class.
+            </remarks>
   </Docs>
   <Members>
     <Member MemberName=".ctor">
@@ -19,7 +23,9 @@
       <MemberType>Constructor</MemberType>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
+        <summary>
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -35,9 +41,99 @@
         <Parameter Name="sessions" Type="WebSocketSharp.Server.SessionManager" />
       </Parameters>
       <Docs>
-        <param name="socket">To be added.</param>
-        <param name="sessions">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="socket">
+            A <see cref="T:WebSocketSharp.WebSocket" /> to bind to the WebSocketService.
+            </param>
+        <param name="sessions">
+            A <see cref="T:WebSocketSharp.Server.SessionManager" /> to bind to the WebSocketService.
+            </param>
+        <summary>
+            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> and <see cref="T:WebSocketSharp.Server.SessionManager" />
+            to a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Broadcast">
+      <MemberSignature Language="C#" Value="public void Broadcast (byte[] data);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Broadcast(unsigned int8[] data) cil managed" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="data" Type="System.Byte[]" />
+      </Parameters>
+      <Docs>
+        <param name="data">
+            An array of <see cref="T:System.Byte" /> to broadcast.
+            </param>
+        <summary>
+            Broadcasts the specified array of <see cref="T:System.Byte" /> to all clients of the WebSocket service.
+            </summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Broadcast">
+      <MemberSignature Language="C#" Value="public void Broadcast (string data);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Broadcast(string data) cil managed" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="data" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="data">
+            A <see cref="T:System.String" /> to broadcast.
+            </param>
+        <summary>
+            Broadcasts the specified <see cref="T:System.String" /> to all clients of the WebSocket service.
+            </summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Broadping">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.Dictionary&lt;string,bool&gt; Broadping ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.Dictionary`2&lt;string, bool&gt; Broadping() cil managed" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Collections.Generic.Dictionary&lt;System.String,System.Boolean&gt;</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>
+            Pings to all clients of the WebSocket service.
+            </summary>
+        <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+            indicating whether the WebSocket service received a Pong in a time.
+            </returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Broadping">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.Dictionary&lt;string,bool&gt; Broadping (string message);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.Dictionary`2&lt;string, bool&gt; Broadping(string message) cil managed" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Collections.Generic.Dictionary&lt;System.String,System.Boolean&gt;</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="message" Type="System.String" />
+      </Parameters>
+      <Docs>
+        <param name="message">
+            A <see cref="T:System.String" /> that contains a message.
+            </param>
+        <summary>
+            Pings with the specified <see cref="T:System.String" /> to all clients of the WebSocket service.
+            </summary>
+        <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of the ID and value
+            indicating whether the WebSocket service received a Pong in a time.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -49,8 +145,12 @@
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <summary>
+            Gets the ID of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+        <value>
+            A <see cref="T:System.String" /> that contains a ID.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -62,80 +162,87 @@
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <summary>
+            Gets a value indicating whether a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance is bound to a <see cref="T:WebSocketSharp.WebSocket" />.
+            </summary>
+        <value>
+          <c>true</c> if the WebSocketService is bound to a WebSocket; otherwise, <c>false</c>.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OnClose">
-      <MemberSignature Language="C#" Value="protected virtual void OnClose (object sender, WebSocketSharp.CloseEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnClose(object sender, class WebSocketSharp.CloseEventArgs e) cil managed" />
+      <MemberSignature Language="C#" Value="protected virtual void OnClose (WebSocketSharp.CloseEventArgs e);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnClose(class WebSocketSharp.CloseEventArgs e) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="sender" Type="System.Object" />
         <Parameter Name="e" Type="WebSocketSharp.CloseEventArgs" />
       </Parameters>
       <Docs>
-        <param name="sender">To be added.</param>
-        <param name="e">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="e">
+            A <see cref="T:WebSocketSharp.CloseEventArgs" /> that contains the event data associated with a <see cref="E:WebSocketSharp.WebSocket.OnClose" /> event.
+            </param>
+        <summary>
+            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> receives a Close frame or the Stop method is called.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OnError">
-      <MemberSignature Language="C#" Value="protected virtual void OnError (object sender, WebSocketSharp.ErrorEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnError(object sender, class WebSocketSharp.ErrorEventArgs e) cil managed" />
+      <MemberSignature Language="C#" Value="protected virtual void OnError (WebSocketSharp.ErrorEventArgs e);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnError(class WebSocketSharp.ErrorEventArgs e) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="sender" Type="System.Object" />
         <Parameter Name="e" Type="WebSocketSharp.ErrorEventArgs" />
       </Parameters>
       <Docs>
-        <param name="sender">To be added.</param>
-        <param name="e">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="e">
+            An <see cref="T:WebSocketSharp.ErrorEventArgs" /> that contains the event data associated with a <see cref="E:WebSocketSharp.WebSocket.OnError" /> event.
+            </param>
+        <summary>
+            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> gets an error.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OnMessage">
-      <MemberSignature Language="C#" Value="protected virtual void OnMessage (object sender, WebSocketSharp.MessageEventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnMessage(object sender, class WebSocketSharp.MessageEventArgs e) cil managed" />
+      <MemberSignature Language="C#" Value="protected virtual void OnMessage (WebSocketSharp.MessageEventArgs e);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnMessage(class WebSocketSharp.MessageEventArgs e) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="sender" Type="System.Object" />
         <Parameter Name="e" Type="WebSocketSharp.MessageEventArgs" />
       </Parameters>
       <Docs>
-        <param name="sender">To be added.</param>
-        <param name="e">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="e">
+            A <see cref="T:WebSocketSharp.MessageEventArgs" /> that contains the event data associated with a <see cref="E:WebSocketSharp.WebSocket.OnMessage" /> event.
+            </param>
+        <summary>
+            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> receives a data frame.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OnOpen">
-      <MemberSignature Language="C#" Value="protected virtual void OnOpen (object sender, EventArgs e);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnOpen(object sender, class System.EventArgs e) cil managed" />
+      <MemberSignature Language="C#" Value="protected virtual void OnOpen ();" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig newslot virtual instance void OnOpen() cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
-      <Parameters>
-        <Parameter Name="sender" Type="System.Object" />
-        <Parameter Name="e" Type="System.EventArgs" />
-      </Parameters>
+      <Parameters />
       <Docs>
-        <param name="sender">To be added.</param>
-        <param name="e">To be added.</param>
-        <summary>To be added.</summary>
+        <summary>
+            Occurs when the WebSocket connection has been established.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -148,8 +255,12 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <summary>
+            Pings to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+        <returns>
+          <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -164,40 +275,15 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="message">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PingAround">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.Dictionary&lt;string,bool&gt; PingAround ();" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.Dictionary`2&lt;string, bool&gt; PingAround() cil managed" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.Dictionary&lt;System.String,System.Boolean&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters />
-      <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="PingAround">
-      <MemberSignature Language="C#" Value="public System.Collections.Generic.Dictionary&lt;string,bool&gt; PingAround (string message);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance class System.Collections.Generic.Dictionary`2&lt;string, bool&gt; PingAround(string message) cil managed" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Collections.Generic.Dictionary&lt;System.String,System.Boolean&gt;</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="message" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <param name="message">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="message">
+            A <see cref="T:System.String" /> that contains a message.
+            </param>
+        <summary>
+            Pings with the specified <see cref="T:System.String" /> to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
+        <returns>
+          <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -212,9 +298,15 @@
         <Parameter Name="id" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="id">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the Ping.
+            </param>
+        <summary>
+            Pings to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance associated with the specified ID.
+            </summary>
+        <returns>
+          <c>true</c> if the WebSocket service receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -230,42 +322,19 @@
         <Parameter Name="message" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="id">To be added.</param>
-        <param name="message">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Publish">
-      <MemberSignature Language="C#" Value="public void Publish (byte[] data);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Publish(unsigned int8[] data) cil managed" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="data" Type="System.Byte[]" />
-      </Parameters>
-      <Docs>
-        <param name="data">To be added.</param>
-        <summary>To be added.</summary>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="Publish">
-      <MemberSignature Language="C#" Value="public void Publish (string data);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Publish(string data) cil managed" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="data" Type="System.String" />
-      </Parameters>
-      <Docs>
-        <param name="data">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the Ping.
+            </param>
+        <param name="message">
+            A <see cref="T:System.String" /> that contains a message.
+            </param>
+        <summary>
+            Pings with the specified <see cref="T:System.String" /> to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified ID.
+            </summary>
+        <returns>
+          <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -277,8 +346,12 @@
         <ReturnType>System.Collections.Specialized.NameValueCollection</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <summary>
+            Gets the HTTP query string variables used in the WebSocket opening handshake.
+            </summary>
+        <value>
+            A <see cref="T:System.Collections.Specialized.NameValueCollection" /> that contains the query string variables.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -293,8 +366,12 @@
         <Parameter Name="data" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="data">
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
+            </param>
+        <summary>
+            Sends a binary data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -309,8 +386,12 @@
         <Parameter Name="data" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="data">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="data">
+            A <see cref="T:System.String" /> that contains a text data to send.
+            </param>
+        <summary>
+            Sends a text data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -326,9 +407,15 @@
         <Parameter Name="data" Type="System.Byte[]" />
       </Parameters>
       <Docs>
-        <param name="id">To be added.</param>
-        <param name="data">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            </param>
+        <param name="data">
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
+            </param>
+        <summary>
+            Sends a binary data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance associated with the specified ID.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -344,9 +431,15 @@
         <Parameter Name="data" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="id">To be added.</param>
-        <param name="data">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="id">
+            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            </param>
+        <param name="data">
+            A <see cref="T:System.String" /> that contains a text data to send.
+            </param>
+        <summary>
+            Sends a text data to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance associated with the specified ID.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -358,8 +451,12 @@
         <ReturnType>WebSocketSharp.Server.SessionManager</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <summary>
+            Gets the sessions to the WebSocket service.
+            </summary>
+        <value>
+            A <see cref="T:WebSocketSharp.Server.SessionManager" /> that contains the sessions to the WebSocket service.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -372,7 +469,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
+        <summary>
+            Starts a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -385,7 +484,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
+        <summary>
+            Stops a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -401,9 +502,15 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="code">To be added.</param>
-        <param name="reason">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="code">
+            A <see cref="T:System.UInt16" /> that contains a status code indicating the reason for stop.
+            </param>
+        <param name="reason">
+            A <see cref="T:System.String" /> that contains a reason for stop.
+            </param>
+        <summary>
+            Stops a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance with the specified <see cref="T:System.UInt16" /> and <see cref="T:System.String" />.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -419,9 +526,15 @@
         <Parameter Name="reason" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="code">To be added.</param>
-        <param name="reason">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="code">
+            One of the <see cref="T:WebSocketSharp.CloseStatusCode" /> values that contains a status code indicating the reason for stop.
+            </param>
+        <param name="reason">
+            A <see cref="T:System.String" /> that contains a reason for stop.
+            </param>
+        <summary>
+            Stops a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance with the specified <see cref="T:WebSocketSharp.CloseStatusCode" /> and <see cref="T:System.String" />.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml
index 30571ce2..719a4f21 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml
@@ -28,7 +28,7 @@
             Provides the functions of the server that receives the WebSocket connection requests.
             </summary>
     <remarks>
-            The WebSocketServiceHost&lt;T&gt; class provides single WebSocket service.
+            The WebSocketServiceHost&lt;T&gt; class provides the single WebSocket service.
             </remarks>
   </Docs>
   <Members>
@@ -149,7 +149,7 @@
       </Parameters>
       <Docs>
         <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -176,7 +176,7 @@
       </Parameters>
       <Docs>
         <param name="address">
-            An <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -195,21 +195,21 @@
       </Docs>
     </Member>
     <Member MemberName="AcceptWebSocket">
-      <MemberSignature Language="C#" Value="protected override void AcceptWebSocket (System.Net.Sockets.TcpClient client);" />
-      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void AcceptWebSocket(class System.Net.Sockets.TcpClient client) cil managed" />
+      <MemberSignature Language="C#" Value="protected override void AcceptWebSocket (WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext context);" />
+      <MemberSignature Language="ILAsm" Value=".method familyhidebysig virtual instance void AcceptWebSocket(class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext context) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Void</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="client" Type="System.Net.Sockets.TcpClient" />
+        <Parameter Name="context" Type="WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" />
       </Parameters>
       <Docs>
-        <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains the TCP connection.
+        <param name="context">
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </param>
         <summary>
-            Accepts the WebSocket connection.
+            Accepts a WebSocket connection.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -229,7 +229,7 @@
             A <see cref="T:System.String" /> to broadcast.
             </param>
         <summary>
-            Broadcasts the specified <see cref="T:System.String" />.
+            Broadcasts the specified <see cref="T:System.String" /> to all clients.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -251,7 +251,10 @@
         <summary>
             Pings with the specified <see cref="T:System.String" /> to all clients.
             </summary>
-        <returns>To be added.</returns>
+        <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of the session ID and value
+            indicating whether the server received a Pong in a time.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml
index 23c5eacb..ee90615f 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml
@@ -16,32 +16,63 @@
   </Docs>
   <Members>
     <Member MemberName="AcceptWebSocket">
-      <MemberSignature Language="C#" Value="public static WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket (this System.Net.Sockets.TcpClient client, bool secure);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket(class System.Net.Sockets.TcpClient client, bool secure) cil managed" />
+      <MemberSignature Language="C#" Value="public static WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket (this System.Net.Sockets.TcpListener listener, bool secure);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket(class System.Net.Sockets.TcpListener listener, bool secure) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="client" Type="System.Net.Sockets.TcpClient" RefType="this" />
+        <Parameter Name="listener" Type="System.Net.Sockets.TcpListener" RefType="this" />
         <Parameter Name="secure" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains a TCP connection to accept a WebSocket connection from.
+        <param name="listener">
+            A <see cref="T:System.Net.Sockets.TcpListener" /> that provides a TCP connection to accept a WebSocket connection.
             </param>
         <param name="secure">
             A <see cref="T:System.Boolean" /> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
             </param>
         <summary>
-            Accept a WebSocket connection by the <see cref="T:System.Net.Sockets.TcpListener" />.
+            Accepts a WebSocket connection by the <see cref="T:System.Net.Sockets.TcpListener" />.
             </summary>
         <returns>
             A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
             </returns>
         <remarks>To be added.</remarks>
         <exception cref="T:System.ArgumentNullException">
-            Is thrown when the <paramref name="client" /> parameter passed to a method is invalid because it is <see langword="null" />.
+          <paramref name="listener" /> is <see langword="null" />.
+            </exception>
+      </Docs>
+    </Member>
+    <Member MemberName="AcceptWebSocketAsync">
+      <MemberSignature Language="C#" Value="public static void AcceptWebSocketAsync (this System.Net.Sockets.TcpListener listener, bool secure, Action&lt;WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt; completed);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig void AcceptWebSocketAsync(class System.Net.Sockets.TcpListener listener, bool secure, class System.Action`1&lt;class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt; completed) cil managed" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="listener" Type="System.Net.Sockets.TcpListener" RefType="this" />
+        <Parameter Name="secure" Type="System.Boolean" />
+        <Parameter Name="completed" Type="System.Action&lt;WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt;" />
+      </Parameters>
+      <Docs>
+        <param name="listener">
+            A <see cref="T:System.Net.Sockets.TcpListener" /> that provides a TCP connection to accept a WebSocket connection.
+            </param>
+        <param name="secure">
+            A <see cref="T:System.Boolean" /> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
+            </param>
+        <param name="completed">
+            An Action&lt;TcpListenerWebSocketContext&gt; delegate that contains the method(s) that is called when an asynchronous operation completes.
+            </param>
+        <summary>
+            Accepts a WebSocket connection asynchronously by the <see cref="T:System.Net.Sockets.TcpListener" />.
+            </summary>
+        <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">
+          <paramref name="listener" /> is <see langword="null" />.
             </exception>
       </Docs>
     </Member>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml
index 46e392cf..cad4d74b 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml
@@ -150,7 +150,7 @@
       </Parameters>
       <Docs>
         <param name="code">
-            A <see cref="!:WebSocketSharp.Frame.CloseStatusCode" /> that contains a status code indicating a reason for closure.
+            A <see cref="T:WebSocketSharp.CloseStatusCode" /> that contains a status code indicating a reason for closure.
             </param>
         <summary>
             Closes the connection and releases all associated resources after sends a Close control frame.
@@ -195,7 +195,7 @@
       </Parameters>
       <Docs>
         <param name="code">
-            A <see cref="!:WebSocketSharp.Frame.CloseStatusCode" /> that contains a status code indicating a reason for closure.
+            A <see cref="T:WebSocketSharp.CloseStatusCode" /> that contains a status code indicating a reason for closure.
             </param>
         <param name="reason">
             A <see cref="T:System.String" /> that contains a reason for closure.
@@ -435,7 +435,7 @@
       </Parameters>
       <Docs>
         <param name="data">
-            An array of <see cref="T:System.Byte" /> that contains the binary data to be sent.
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
             </param>
         <summary>
             Sends a binary data using the connection.
@@ -455,7 +455,7 @@
       </Parameters>
       <Docs>
         <param name="file">
-            A <see cref="T:System.IO.FileInfo" /> that contains the binary data to be sent.
+            A <see cref="T:System.IO.FileInfo" /> that contains a binary data to send.
             </param>
         <summary>
             Sends a binary data using the connection.
@@ -475,7 +475,7 @@
       </Parameters>
       <Docs>
         <param name="data">
-            A <see cref="T:System.String" /> that contains the text data to be sent.
+            A <see cref="T:System.String" /> that contains a text data to send.
             </param>
         <summary>
             Sends a text data using the connection.
@@ -496,7 +496,7 @@
       </Parameters>
       <Docs>
         <param name="data">
-            An array of <see cref="T:System.Byte" /> that contains the binary data to be sent.
+            An array of <see cref="T:System.Byte" /> that contains a binary data to send.
             </param>
         <param name="completed">
             An <see cref="T:System.Action" /> delegate that contains the method(s) that is called when an asynchronous operation completes.
@@ -520,7 +520,7 @@
       </Parameters>
       <Docs>
         <param name="file">
-            A <see cref="T:System.IO.FileInfo" /> that contains the binary data to be sent.
+            A <see cref="T:System.IO.FileInfo" /> that contains a binary data to send.
             </param>
         <param name="completed">
             An <see cref="T:System.Action" /> delegate that contains the method(s) that is called when an asynchronous operation completes.
@@ -544,7 +544,7 @@
       </Parameters>
       <Docs>
         <param name="data">
-            A <see cref="T:System.String" /> that contains the text data to be sent.
+            A <see cref="T:System.String" /> that contains a text data to send.
             </param>
         <param name="completed">
             An <see cref="T:System.Action" /> delegate that contains the method(s) that is called when an asynchronous operation completes.
diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml
index bc766ada..d1c32f40 100644
--- a/websocket-sharp/doc/mdoc/index.xml
+++ b/websocket-sharp/doc/mdoc/index.xml
@@ -1,6 +1,6 @@
 <Overview>
   <Assemblies>
-    <Assembly Name="websocket-sharp" Version="1.0.2.30559">
+    <Assembly Name="websocket-sharp" Version="1.0.2.28541">
       <AssemblyPublicKey>[00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 29 17 fb 89 fe c3 91 f7 2b cb 8b e2 61 d2 3f 05 93 6d 65 a8 9e 63 72 a6 f5 d5 2c f2 9d 20 fa 0b c0 70 6a f6 88 7e 8b 90 3f 39 f5 76 c8 48 e0 bb 7b b2 7b ed d3 10 a7 1a 0f 70 98 0f 7f f4 4b 53 09 d2 a5 ef 36 c3 56 b4 aa f0 91 72 63 25 07 89 e0 93 3e 3f 2e f2 b9 73 0e 12 15 5d 43 56 c3 f4 70 a5 89 fe f7 f6 ac 3e 77 c2 d8 d0 84 91 f4 0c d1 f3 8e dc c3 c3 b8 38 3d 0c bf 17 de 20 78 c1 ]</AssemblyPublicKey>
       <Attributes>
         <Attribute>
@@ -82,31 +82,64 @@
   <ExtensionMethods>
     <ExtensionMethod>
       <Targets>
-        <Target Type="T:System.Net.Sockets.TcpClient" />
+        <Target Type="T:System.Net.Sockets.TcpListener" />
       </Targets>
       <Member MemberName="AcceptWebSocket">
-        <MemberSignature Language="C#" Value="public static WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket (this System.Net.Sockets.TcpClient client, bool secure);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket(class System.Net.Sockets.TcpClient client, bool secure) cil managed" />
+        <MemberSignature Language="C#" Value="public static WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket (this System.Net.Sockets.TcpListener listener, bool secure);" />
+        <MemberSignature Language="ILAsm" Value=".method public static hidebysig class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext AcceptWebSocket(class System.Net.Sockets.TcpListener listener, bool secure) cil managed" />
         <MemberType>ExtensionMethod</MemberType>
         <ReturnValue>
           <ReturnType>WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</ReturnType>
         </ReturnValue>
         <Parameters>
-          <Parameter Name="client" Type="System.Net.Sockets.TcpClient" RefType="this" />
+          <Parameter Name="listener" Type="System.Net.Sockets.TcpListener" RefType="this" />
           <Parameter Name="secure" Type="System.Boolean" />
         </Parameters>
         <Docs>
-          <param name="client">
-            A <see cref="T:System.Net.Sockets.TcpClient" /> that contains a TCP connection to accept a WebSocket connection from.
+          <param name="listener">
+            A <see cref="T:System.Net.Sockets.TcpListener" /> that provides a TCP connection to accept a WebSocket connection.
             </param>
           <param name="secure">
             A <see cref="T:System.Boolean" /> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
             </param>
           <summary>
-            Accept a WebSocket connection by the <see cref="T:System.Net.Sockets.TcpListener" />.
+            Accepts a WebSocket connection by the <see cref="T:System.Net.Sockets.TcpListener" />.
             </summary>
         </Docs>
-        <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpClient,System.Boolean)" />
+        <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.AcceptWebSocket(System.Net.Sockets.TcpListener,System.Boolean)" />
+      </Member>
+    </ExtensionMethod>
+    <ExtensionMethod>
+      <Targets>
+        <Target Type="T:System.Net.Sockets.TcpListener" />
+      </Targets>
+      <Member MemberName="AcceptWebSocketAsync">
+        <MemberSignature Language="C#" Value="public static void AcceptWebSocketAsync (this System.Net.Sockets.TcpListener listener, bool secure, Action&lt;WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt; completed);" />
+        <MemberSignature Language="ILAsm" Value=".method public static hidebysig void AcceptWebSocketAsync(class System.Net.Sockets.TcpListener listener, bool secure, class System.Action`1&lt;class WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt; completed) cil managed" />
+        <MemberType>ExtensionMethod</MemberType>
+        <ReturnValue>
+          <ReturnType>System.Void</ReturnType>
+        </ReturnValue>
+        <Parameters>
+          <Parameter Name="listener" Type="System.Net.Sockets.TcpListener" RefType="this" />
+          <Parameter Name="secure" Type="System.Boolean" />
+          <Parameter Name="completed" Type="System.Action&lt;WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext&gt;" />
+        </Parameters>
+        <Docs>
+          <param name="listener">
+            A <see cref="T:System.Net.Sockets.TcpListener" /> that provides a TCP connection to accept a WebSocket connection.
+            </param>
+          <param name="secure">
+            A <see cref="T:System.Boolean" /> that indicates a secure connection or not. (<c>true</c> indicates a secure connection.)
+            </param>
+          <param name="completed">
+            An Action&lt;TcpListenerWebSocketContext&gt; delegate that contains the method(s) that is called when an asynchronous operation completes.
+            </param>
+          <summary>
+            Accepts a WebSocket connection asynchronously by the <see cref="T:System.Net.Sockets.TcpListener" />.
+            </summary>
+        </Docs>
+        <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.AcceptWebSocketAsync(System.Net.Sockets.TcpListener,System.Boolean,System.Action{WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext})" />
       </Member>
     </ExtensionMethod>
     <ExtensionMethod>
diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb
index f67978c9..fdc8f550 100644
Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ