diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe
index 44d145be..9076cc12 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 0cd91be0..d9c4269f 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 44c92fba..88aef5a6 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 5bcb9896..a12b5378 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/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe
index 31a1cc9c..64c8dac4 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 9f1f4939..b878be28 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 44c92fba..88aef5a6 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 5bcb9896..a12b5378 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/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe
index c8d13080..57a34899 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 6ddccbd9..5009284a 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 44c92fba..88aef5a6 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 5bcb9896..a12b5378 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/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe
index 173f8c95..5a50c19e 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 f1f6308d..7e318a3d 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 44c92fba..88aef5a6 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 5bcb9896..a12b5378 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/websocket-sharp/AssemblyInfo.cs b/websocket-sharp/AssemblyInfo.cs
index dcdc29d1..4db7a594 100644
--- a/websocket-sharp/AssemblyInfo.cs
+++ b/websocket-sharp/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 // Change them to the values specific to your project.
 
 [assembly: AssemblyTitle("websocket-sharp")]
-[assembly: AssemblyDescription("A C# implementation of WebSocket protocol client & server")]
+[assembly: AssemblyDescription("A C# implementation of the WebSocket protocol client & server")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("websocket-sharp.dll")]
@@ -24,4 +24,3 @@ using System.Runtime.CompilerServices;
 
 //[assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyFile("")]
-
diff --git a/websocket-sharp/Server/IServiceHost.cs b/websocket-sharp/Server/IServiceHost.cs
index 4ecfe8c1..a30f5a67 100644
--- a/websocket-sharp/Server/IServiceHost.cs
+++ b/websocket-sharp/Server/IServiceHost.cs
@@ -38,23 +38,23 @@ namespace WebSocketSharp.Server {
   public interface IServiceHost {
 
     /// <summary>
-    /// Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service client.
+    /// Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service clients periodically.
     /// </summary>
     /// <value>
-    /// <c>true</c> if the WebSocket service host cleans up the inactive service client; otherwise, <c>false</c>.
+    /// <c>true</c> if the WebSocket service host cleans up the inactive service clients periodically; otherwise, <c>false</c>.
     /// </value>
     bool Sweeped { get; set; }
 
     /// <summary>
-    /// Binds the specified <see cref="WebSocket"/> instance to the WebSocket service.
+    /// Binds the specified <see cref="WebSocket"/> to the WebSocket service instance.
     /// </summary>
     /// <param name="socket">
-    /// An <see cref="WebSocketSharp.WebSocket"/> to bind.
+    /// A <see cref="WebSocketSharp.WebSocket"/> to bind.
     /// </param>
     void BindWebSocket(WebSocket socket);
 
     /// <summary>
-    /// Broadcasts the specified <see cref="string"/>.
+    /// Broadcasts the specified <see cref="string"/> to all service clients.
     /// </summary>
     /// <param name="data">
     /// A <see cref="string"/> to broadcast.
diff --git a/websocket-sharp/Server/SessionManager.cs b/websocket-sharp/Server/SessionManager.cs
deleted file mode 100644
index 50f71362..00000000
--- a/websocket-sharp/Server/SessionManager.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-#region MIT License
-/*
- * SessionManager.cs
- *
- * The MIT License
- *
- * Copyright (c) 2012-2013 sta.blockhead
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Timers;
-
-namespace WebSocketSharp.Server {
-
-  public class SessionManager {
-
-    #region Private Fields
-
-    private object                               _forSweep;
-    private volatile bool                        _isStopped;
-    private volatile bool                        _isSweeping;
-    private Dictionary<string, WebSocketService> _sessions;
-    private Timer                                _sweepTimer;
-    private object                               _syncRoot;
-
-    #endregion
-
-    #region Public Constructor
-
-    public SessionManager()
-    {
-      _forSweep   = new object();
-      _isStopped  = false;
-      _isSweeping = false;
-      _sessions   = new Dictionary<string, WebSocketService>();
-      _sweepTimer = new Timer(60 * 1000);
-      _sweepTimer.Elapsed += (sender, e) =>
-      {
-        Sweep();
-      };
-      _syncRoot   = new object();
-
-      startSweepTimer();
-    }
-
-    #endregion
-
-    #region Properties
-
-    public IEnumerable<string> ActiveID {
-      get {
-        return from result in Broadping(String.Empty)
-               where result.Value
-               select result.Key;
-      }
-    }
-
-    public int Count {
-      get {
-        lock (_syncRoot)
-        {
-          return _sessions.Count;
-        }
-      }
-    } 
-
-    public IEnumerable<string> InactiveID {
-      get {
-        return from result in Broadping(String.Empty)
-               where !result.Value
-               select result.Key;
-      }
-    }
-
-    public IEnumerable<string> ID {
-      get {
-        lock (_syncRoot)
-        {
-          return _sessions.Keys;
-        }
-      }
-    }
-
-    public bool Sweeped {
-      get {
-        return _sweepTimer.Enabled;
-      }
-
-      set {
-        if (value && !_isStopped)
-          startSweepTimer();
-
-        if (!value)
-          stopSweepTimer();
-      }
-    }
-
-    public object SyncRoot {
-      get {
-        return _syncRoot;
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void broadcast(byte[] data)
-    {
-      lock (_syncRoot)
-      {
-        foreach (var service in _sessions.Values)
-          service.Send(data);
-      }
-    }
-
-    private void broadcast(string data)
-    {
-      lock (_syncRoot)
-      {
-        foreach (var service in _sessions.Values)
-          service.Send(data);
-      }
-    }
-
-    private void broadcastAsync(byte[] data)
-    {
-      var sessions = copySessions();
-      var services = sessions.Values.GetEnumerator();
-
-      Action completed = null;
-      completed = () =>
-      {
-        if (services.MoveNext())
-          services.Current.SendAsync(data, completed);
-      };
-
-      if (services.MoveNext())
-        services.Current.SendAsync(data, completed);
-    }
-
-    private void broadcastAsync(string data)
-    {
-      var sessions = copySessions();
-      var services = sessions.Values.GetEnumerator();
-
-      Action completed = null;
-      completed = () =>
-      {
-        if (services.MoveNext())
-          services.Current.SendAsync(data, completed);
-      };
-
-      if (services.MoveNext())
-        services.Current.SendAsync(data, completed);
-    }
-
-    private Dictionary<string, WebSocketService> copySessions()
-    {
-      lock (_syncRoot)
-      {
-        return new Dictionary<string, WebSocketService>(_sessions);
-      }
-    }
-
-    private string createID()
-    {
-      return Guid.NewGuid().ToString("N");
-    }
-
-    private void startSweepTimer()
-    {
-      if (!Sweeped)
-        _sweepTimer.Start();
-    }
-
-    private void stopSweepTimer()
-    {
-      if (Sweeped)
-        _sweepTimer.Stop();
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    public string Add(WebSocketService service)
-    {
-      lock (_syncRoot)
-      {
-        if (_isStopped)
-          return null;
-
-        var id = createID();
-        _sessions.Add(id, service);
-
-        return id;
-      }
-    }
-
-    public void Broadcast(byte[] data)
-    {
-      if (_isStopped)
-        broadcast(data);
-      else
-        broadcastAsync(data);
-    }
-
-    public void Broadcast(string data)
-    {
-      if (_isStopped)
-        broadcast(data);
-      else
-        broadcastAsync(data);
-    }
-
-    public Dictionary<string, bool> Broadping(string message)
-    {
-      var result = new Dictionary<string, bool>();
-      foreach (var session in copySessions())
-        result.Add(session.Key, session.Value.Ping(message));
-
-      return result;
-    }
-
-    public bool Remove(string id)
-    {
-      lock (_syncRoot)
-      {
-        return _sessions.Remove(id);
-      }
-    }
-
-    public bool TryGetByID(string id, out WebSocketService service)
-    {
-      lock (_syncRoot)
-      {
-        return _sessions.TryGetValue(id, out service);
-      }
-    }
-
-    public void Stop()
-    {
-      Stop(CloseStatusCode.NORMAL, String.Empty);
-    }
-
-    public void Stop(CloseStatusCode code, string reason)
-    {
-      stopSweepTimer();
-      lock (_syncRoot)
-      {
-        if (_isStopped)
-          return;
-
-        _isStopped = true;
-        foreach (var service in copySessions().Values)
-          service.Stop(code, reason);
-      }
-    }
-
-    public void Sweep()
-    {
-      if (_isStopped || _isSweeping || Count == 0)
-        return;
-
-      lock (_forSweep)
-      {
-        _isSweeping = true;
-        foreach (var id in InactiveID)
-        {
-          lock (_syncRoot)
-          {
-            if (_isStopped)
-            {
-              _isSweeping = false;
-              return;
-            }
-
-            WebSocketService service;
-            if (TryGetByID(id, out service))
-              service.Stop(CloseStatusCode.ABNORMAL, String.Empty);
-          }
-        }
-
-        _isSweeping = false;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index a463a95a..407910f7 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -111,7 +111,7 @@ namespace WebSocketSharp.Server {
     /// on the specified <paramref name="address"/> and <paramref name="port"/>.
     /// </summary>
     /// <param name="address">
-    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains a local IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -126,7 +126,7 @@ namespace WebSocketSharp.Server {
     /// on the specified <paramref name="address"/>, <paramref name="port"/> and <paramref name="secure"/>.
     /// </summary>
     /// <param name="address">
-    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains a local IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -145,10 +145,10 @@ namespace WebSocketSharp.Server {
     #region Properties
 
     /// <summary>
-    /// Gets the paths associated with the each WebSocket services.
+    /// Gets the collection of paths associated with the every WebSocket services that the server provides.
     /// </summary>
     /// <value>
-    /// An IEnumerable&lt;string&gt; that contains the paths.
+    /// An IEnumerable&lt;string&gt; that contains the collection of paths.
     /// </value>
     public IEnumerable<string> ServicePaths {
       get {
@@ -161,10 +161,10 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Gets or sets a value indicating whether the server cleans up the inactive client.
+    /// Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
     /// </summary>
     /// <value>
-    /// <c>true</c> if the server cleans up the inactive client; otherwise, <c>false</c>.
+    /// <c>true</c> if the server cleans up the inactive clients every 60 seconds; otherwise, <c>false</c>.
     /// </value>
     public bool Sweeped {
       get {
@@ -193,7 +193,7 @@ namespace WebSocketSharp.Server {
     /// Accepts a WebSocket connection.
     /// </summary>
     /// <param name="context">
-    /// A <see cref="TcpListenerWebSocketContext"/> that contains a WebSocket connection.
+    /// A <see cref="TcpListenerWebSocketContext"/> that contains the WebSocket connection request objects.
     /// </param>
     protected override void AcceptWebSocket(TcpListenerWebSocketContext context)
     {
@@ -221,10 +221,10 @@ namespace WebSocketSharp.Server {
     /// Adds a WebSocket service.
     /// </summary>
     /// <param name="absPath">
-    /// A <see cref="string"/> that contains an absolute path associated with a WebSocket service.
+    /// A <see cref="string"/> that contains an absolute path associated with the WebSocket service.
     /// </param>
     /// <typeparam name="T">
-    /// The type of a WebSocket service. The T must inherit the <see cref="WebSocketService"/> class.
+    /// The type of the WebSocket service. The T must inherit the <see cref="WebSocketService"/> class.
     /// </typeparam>
     public void AddService<T>(string absPath)
       where T : WebSocketService, new()
diff --git a/websocket-sharp/Server/WebSocketServerBase.cs b/websocket-sharp/Server/WebSocketServerBase.cs
index 1cd0c3c7..1f8febab 100644
--- a/websocket-sharp/Server/WebSocketServerBase.cs
+++ b/websocket-sharp/Server/WebSocketServerBase.cs
@@ -96,7 +96,7 @@ namespace WebSocketSharp.Server {
     /// on the specified <paramref name="address"/>, <paramref name="port"/>, <paramref name="absPath"/> and <paramref name="secure"/>.
     /// </summary>
     /// <param name="address">
-    /// A <see cref="IPAddress"/> that contains an IP address.
+    /// A <see cref="IPAddress"/> that contains a local IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -177,10 +177,10 @@ namespace WebSocketSharp.Server {
     #region Public Properties
 
     /// <summary>
-    /// Gets the IP address on which to listen for incoming connection attempts.
+    /// Gets the local IP address on which to listen for incoming connection attempts.
     /// </summary>
     /// <value>
-    /// A <see cref="IPAddress"/> that contains an IP address.
+    /// A <see cref="IPAddress"/> that contains a local IP address.
     /// </value>
     public IPAddress Address {
       get {
@@ -189,10 +189,10 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Gets a value indicating whether this server provides secure connection.
+    /// Gets a value indicating whether the server provides secure connection.
     /// </summary>
     /// <value>
-    /// <c>true</c> if this server provides secure connection; otherwise, <c>false</c>.
+    /// <c>true</c> if the server provides secure connection; otherwise, <c>false</c>.
     /// </value>
     public bool IsSecure {
       get {
@@ -201,10 +201,10 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Gets a value indicating whether this server is self host.
+    /// Gets a value indicating whether the server is self host.
     /// </summary>
     /// <value>
-    /// <c>true</c> if this server is self host; otherwise, <c>false</c>.
+    /// <c>true</c> if the server is self host; otherwise, <c>false</c>.
     /// </value>
     public bool IsSelfHost {
       get {
@@ -339,7 +339,7 @@ namespace WebSocketSharp.Server {
     /// Accepts a WebSocket connection.
     /// </summary>
     /// <param name="context">
-    /// A <see cref="TcpListenerWebSocketContext"/> that contains a WebSocket connection.
+    /// A <see cref="TcpListenerWebSocketContext"/> that contains the WebSocket connection request objects.
     /// </param>
     protected abstract void AcceptWebSocket(TcpListenerWebSocketContext context);
 
diff --git a/websocket-sharp/Server/WebSocketService.cs b/websocket-sharp/Server/WebSocketService.cs
index dead0831..d02a8e12 100644
--- a/websocket-sharp/Server/WebSocketService.cs
+++ b/websocket-sharp/Server/WebSocketService.cs
@@ -43,8 +43,8 @@ namespace WebSocketSharp.Server {
 
     #region Private Fields
 
-    private SessionManager _sessions;
-    private WebSocket      _socket;
+    private WebSocketServiceManager _sessions;
+    private WebSocket               _socket;
 
     #endregion
 
@@ -79,9 +79,9 @@ namespace WebSocketSharp.Server {
     /// Gets the sessions to the WebSocket service.
     /// </summary>
     /// <value>
-    /// A <see cref="SessionManager"/> that contains the sessions to the WebSocket service.
+    /// A <see cref="WebSocketServiceManager"/> that contains the sessions to the WebSocket service.
     /// </value>
-    protected SessionManager Sessions {
+    protected WebSocketServiceManager Sessions {
       get {
         return IsBound ? _sessions : null;
       }
@@ -92,18 +92,18 @@ namespace WebSocketSharp.Server {
     #region Public Properties
 
     /// <summary>
-    /// Gets the ID of a <see cref="WebSocketService"/> instance.
+    /// Gets the ID of the <see cref="WebSocketService"/> instance.
     /// </summary>
     /// <value>
-    /// A <see cref="string"/> that contains a ID.
+    /// A <see cref="string"/> that contains an 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"/>.
+    /// Gets a value indicating whether the <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>.
+    /// <c>true</c> if the <see cref="WebSocketService"/> instance is bound to a <see cref="WebSocket"/>; otherwise, <c>false</c>.
     /// </value>
     public bool IsBound { get; private set; }
 
@@ -137,6 +137,22 @@ namespace WebSocketSharp.Server {
 
     #region Internal Methods
 
+    internal void Bind(WebSocket socket, WebSocketServiceManager sessions)
+    {
+      if (IsBound)
+        return;
+
+      _socket   = socket;
+      _sessions = sessions;
+
+      _socket.OnOpen    += onOpen;
+      _socket.OnMessage += onMessage;
+      _socket.OnError   += onError;
+      _socket.OnClose   += onClose;
+
+      IsBound = true;
+    }
+
     internal void SendAsync(byte[] data, Action completed)
     {
       _socket.SendAsync(data, completed);
@@ -152,7 +168,7 @@ namespace WebSocketSharp.Server {
     #region Protected Methods
 
     /// <summary>
-    /// Occurs when a inner <see cref="WebSocket"/> receives a Close frame or the Stop method is called.
+    /// Occurs when the 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.
@@ -162,7 +178,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Occurs when a inner <see cref="WebSocket"/> gets an error.
+    /// Occurs when the 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.
@@ -172,7 +188,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Occurs when a inner <see cref="WebSocket"/> receives a data frame.
+    /// Occurs when the 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.
@@ -193,33 +209,8 @@ namespace WebSocketSharp.Server {
     #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;
-
-      _socket.OnOpen    += onOpen;
-      _socket.OnMessage += onMessage;
-      _socket.OnError   += onError;
-      _socket.OnClose   += onClose;
-
-      IsBound = true;
-    }
-
-    /// <summary>
-    /// Broadcasts the specified array of <see cref="byte"/> to all clients of the WebSocket service.
+    /// Broadcasts the specified array of <see cref="byte"/> to the clients of every <see cref="WebSocketService"/> instances
+    /// in the <see cref="WebSocketService.Sessions"/>.
     /// </summary>
     /// <param name="data">
     /// An array of <see cref="byte"/> to broadcast.
@@ -231,7 +222,8 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Broadcasts the specified <see cref="string"/> to all clients of the WebSocket service.
+    /// Broadcasts the specified <see cref="string"/> to the clients of every <see cref="WebSocketService"/> instances
+    /// in the <see cref="WebSocketService.Sessions"/>.
     /// </summary>
     /// <param name="data">
     /// A <see cref="string"/> to broadcast.
@@ -243,11 +235,12 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Pings to all clients of the WebSocket service.
+    /// Pings to the clients of every <see cref="WebSocketService"/> instances
+    /// in the <see cref="WebSocketService.Sessions"/>.
     /// </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.
+    /// A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+    /// indicating whether each <see cref="WebSocketService"/> instances received a Pong in a time.
     /// </returns>
     public Dictionary<string, bool> Broadping()
     {
@@ -255,11 +248,12 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Pings with the specified <see cref="string"/> to all clients of the WebSocket service.
+    /// Pings with the specified <see cref="string"/> to the clients of every <see cref="WebSocketService"/> instances
+    /// in the <see cref="WebSocketService.Sessions"/>.
     /// </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.
+    /// A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+    /// indicating whether each <see cref="WebSocketService"/> instances received a Pong in a time.
     /// </returns>
     /// <param name="message">
     /// A <see cref="string"/> that contains a message.
@@ -272,10 +266,10 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Pings to the client of a <see cref="WebSocketService"/> instance.
+    /// Pings to the client of the <see cref="WebSocketService"/> instance.
     /// </summary>
     /// <returns>
-    /// <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+    /// <c>true</c> if the <see cref="WebSocketService"/> instance receives a Pong in a time; otherwise, <c>false</c>.
     /// </returns>
     public bool Ping()
     {
@@ -283,10 +277,10 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Pings with the specified <see cref="string"/> to the client of a <see cref="WebSocketService"/> instance.
+    /// Pings with the specified <see cref="string"/> to the client of the <see cref="WebSocketService"/> instance.
     /// </summary>
     /// <returns>
-    /// <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+    /// <c>true</c> if the <see cref="WebSocketService"/> instance receives a Pong in a time; otherwise, <c>false</c>.
     /// </returns>
     /// <param name="message">
     /// A <see cref="string"/> that contains a message.
@@ -299,13 +293,14 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Pings to the client of a <see cref="WebSocketService"/> instance associated with the specified ID.
+    /// Pings to the client of the <see cref="WebSocketService"/> instance
+    /// associated with the specified <paramref name="id"/>.
     /// </summary>
     /// <returns>
-    /// <c>true</c> if the WebSocket service receives a Pong in a time; otherwise, <c>false</c>.
+    /// <c>true</c> if the <see cref="WebSocketService"/> instance 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.
+    /// A <see cref="string"/> that contains an ID that represents the destination for the Ping.
     /// </param>
     public bool PingTo(string id)
     {
@@ -313,14 +308,14 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Pings with the specified <see cref="string"/> to the client of a <see cref="WebSocketService"/> instance
-    /// associated with the specified ID.
+    /// Pings with the specified <see cref="string"/> to the client of the <see cref="WebSocketService"/> instance
+    /// associated with the specified <paramref name="id"/>.
     /// </summary>
     /// <returns>
-    /// <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+    /// <c>true</c> if the <see cref="WebSocketService"/> instance 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.
+    /// A <see cref="string"/> that contains an ID that represents the destination for the Ping.
     /// </param>
     /// <param name="message">
     /// A <see cref="string"/> that contains a message.
@@ -331,13 +326,13 @@ namespace WebSocketSharp.Server {
         return false;
 
       WebSocketService service;
-      return _sessions.TryGetByID(id, out service)
+      return _sessions.TryGetWebSocketService(id, out service)
              ? service.Ping(message)
              : false;
     }
 
     /// <summary>
-    /// Sends a binary data to the client of a <see cref="WebSocketService"/> instance.
+    /// Sends a binary data to the client of the <see cref="WebSocketService"/> instance.
     /// </summary>
     /// <param name="data">
     /// An array of <see cref="byte"/> that contains a binary data to send.
@@ -349,7 +344,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Sends a text data to the client of a <see cref="WebSocketService"/> instance.
+    /// Sends a text data to the client of the <see cref="WebSocketService"/> instance.
     /// </summary>
     /// <param name="data">
     /// A <see cref="string"/> that contains a text data to send.
@@ -361,10 +356,11 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Sends a binary data to the client of a <see cref="WebSocketService"/> instance associated with the specified ID.
+    /// Sends a binary data to the client of the <see cref="WebSocketService"/> instance
+    /// associated with the specified <paramref name="id"/>.
     /// </summary>
     /// <param name="id">
-    /// A <see cref="string"/> that contains a ID that represents the destination for the data.
+    /// A <see cref="string"/> that contains an 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.
@@ -375,15 +371,16 @@ namespace WebSocketSharp.Server {
         return;
 
       WebSocketService service;
-      if (_sessions.TryGetByID(id, out service))
+      if (_sessions.TryGetWebSocketService(id, out service))
         service.Send(data);
     }
 
     /// <summary>
-    /// Sends a text data to the client of a <see cref="WebSocketService"/> instance associated with the specified ID.
+    /// Sends a text data to the client of the <see cref="WebSocketService"/> instance
+    /// associated with the specified <paramref name="id"/>.
     /// </summary>
     /// <param name="id">
-    /// A <see cref="string"/> that contains a ID that represents the destination for the data.
+    /// A <see cref="string"/> that contains an ID that represents the destination for the data.
     /// </param>
     /// <param name="data">
     /// A <see cref="string"/> that contains a text data to send.
@@ -394,12 +391,12 @@ namespace WebSocketSharp.Server {
         return;
 
       WebSocketService service;
-      if (_sessions.TryGetByID(id, out service))
+      if (_sessions.TryGetWebSocketService(id, out service))
         service.Send(data);
     }
 
     /// <summary>
-    /// Starts a <see cref="WebSocketService"/> instance.
+    /// Starts the <see cref="WebSocketService"/> instance.
     /// </summary>
     public void Start()
     {
@@ -408,7 +405,7 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Stops a <see cref="WebSocketService"/> instance.
+    /// Stops the <see cref="WebSocketService"/> instance.
     /// </summary>
     public void Stop()
     {
@@ -419,34 +416,34 @@ namespace WebSocketSharp.Server {
     }
 
     /// <summary>
-    /// Stops a <see cref="WebSocketService"/> instance with the specified <see cref="CloseStatusCode"/> and <see cref="string"/>.
+    /// Stops the <see cref="WebSocketService"/> instance with the specified <see cref="ushort"/> 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.
+    /// 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(CloseStatusCode code, string reason)
+    public void Stop(ushort code, string reason)
     {
-      Stop((ushort)code, reason);
+      if (!IsBound)
+        return;
+
+      _socket.Close(code, reason);
     }
 
     /// <summary>
-    /// Stops a <see cref="WebSocketService"/> instance with the specified <see cref="ushort"/> and <see cref="string"/>.
+    /// Stops the <see cref="WebSocketService"/> instance with the specified <see cref="CloseStatusCode"/> and <see cref="string"/>.
     /// </summary>
     /// <param name="code">
-    /// A <see cref="ushort"/> that contains a status code indicating the reason for stop.
+    /// 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(ushort code, string reason)
+    public void Stop(CloseStatusCode code, string reason)
     {
-      if (!IsBound)
-        return;
-
-      _socket.Close(code, reason);
+      Stop((ushort)code, reason);
     }
 
     #endregion
diff --git a/websocket-sharp/Server/WebSocketServiceHost.cs b/websocket-sharp/Server/WebSocketServiceHost.cs
index d2278a1f..f5837367 100644
--- a/websocket-sharp/Server/WebSocketServiceHost.cs
+++ b/websocket-sharp/Server/WebSocketServiceHost.cs
@@ -50,7 +50,7 @@ namespace WebSocketSharp.Server {
   {
     #region Field
 
-    private SessionManager _sessions;
+    private WebSocketServiceManager _sessions;
 
     #endregion
 
@@ -143,7 +143,7 @@ namespace WebSocketSharp.Server {
     /// on the specified <paramref name="address"/>, <paramref name="port"/> and <paramref name="absPath"/>.
     /// </summary>
     /// <param name="address">
-    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains a local IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -161,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">
-    /// A <see cref="System.Net.IPAddress"/> that contains an IP address.
+    /// A <see cref="System.Net.IPAddress"/> that contains a local IP address.
     /// </param>
     /// <param name="port">
     /// An <see cref="int"/> that contains a port number. 
@@ -183,10 +183,10 @@ namespace WebSocketSharp.Server {
     #region Properties
 
     /// <summary>
-    /// Gets or sets a value indicating whether the server cleans up the inactive client.
+    /// Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
     /// </summary>
     /// <value>
-    /// <c>true</c> if the server cleans up the inactive client; otherwise, <c>false</c>.
+    /// <c>true</c> if the server cleans up the inactive clients every 60 seconds; otherwise, <c>false</c>.
     /// </value>
     public bool Sweeped {
       get {
@@ -220,7 +220,7 @@ namespace WebSocketSharp.Server {
 
     private void init()
     {
-      _sessions = new SessionManager();
+      _sessions = new WebSocketServiceManager();
     }
 
     #endregion
@@ -228,7 +228,7 @@ namespace WebSocketSharp.Server {
     #region Explicit Interface Implementation
 
     /// <summary>
-    /// Binds the specified <see cref="WebSocket"/> instance to the WebSocket service.
+    /// Binds the specified <see cref="WebSocket"/> to the WebSocket service instance.
     /// </summary>
     /// <param name="socket">
     /// A <see cref="WebSocket"/> to bind.
@@ -248,7 +248,7 @@ namespace WebSocketSharp.Server {
     /// Accepts a WebSocket connection.
     /// </summary>
     /// <param name="context">
-    /// A <see cref="TcpListenerWebSocketContext"/> that contains a WebSocket connection.
+    /// A <see cref="TcpListenerWebSocketContext"/> that contains the WebSocket connection request objects.
     /// </param>
     protected override void AcceptWebSocket(TcpListenerWebSocketContext context)
     {
@@ -285,8 +285,8 @@ namespace WebSocketSharp.Server {
     /// 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.
+    /// A Dictionary&lt;string, bool&gt; that contains the collection of session IDs and values
+    /// indicating whether the server received the Pongs from each clients in a time.
     /// </returns>
     /// <param name="message">
     /// A <see cref="string"/> that contains a message.
diff --git a/websocket-sharp/Server/WebSocketServiceManager.cs b/websocket-sharp/Server/WebSocketServiceManager.cs
new file mode 100644
index 00000000..9ce56f6d
--- /dev/null
+++ b/websocket-sharp/Server/WebSocketServiceManager.cs
@@ -0,0 +1,408 @@
+#region MIT License
+/*
+ * WebSocketServiceManager.cs
+ *
+ * The MIT License
+ *
+ * Copyright (c) 2012-2013 sta.blockhead
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Timers;
+
+namespace WebSocketSharp.Server {
+
+  /// <summary>
+  /// Manages the collection of <see cref="WebSocketService"/> objects.
+  /// </summary>
+  public class WebSocketServiceManager {
+
+    #region Fields
+
+    private object                               _forSweep;
+    private volatile bool                        _isStopped;
+    private volatile bool                        _isSweeping;
+    private Dictionary<string, WebSocketService> _services;
+    private Timer                                _sweepTimer;
+    private object                               _syncRoot;
+
+    #endregion
+
+    #region Constructor
+
+    internal WebSocketServiceManager()
+    {
+      _forSweep   = new object();
+      _isStopped  = false;
+      _isSweeping = false;
+      _services   = new Dictionary<string, WebSocketService>();
+      _syncRoot   = new object();
+
+      setSweepTimer();
+      startSweepTimer();
+    }
+
+    #endregion
+
+    #region Properties
+
+    /// <summary>
+    /// Gets the collection of IDs of active <see cref="WebSocketService"/> objects
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </summary>
+    /// <value>
+    /// An IEnumerable&lt;string&gt; that contains the collection of IDs of active <see cref="WebSocketService"/> objects.
+    /// </value>
+    public IEnumerable<string> ActiveIDs {
+      get {
+        return from result in Broadping(String.Empty)
+               where result.Value
+               select result.Key;
+      }
+    }
+
+    /// <summary>
+    /// Gets the number of <see cref="WebSocketService"/> objects
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </summary>
+    /// <value>
+    /// An <see cref="int"/> that contains the number of <see cref="WebSocketService"/> objects
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </value>
+    public int Count {
+      get {
+        lock (_syncRoot)
+        {
+          return _services.Count;
+        }
+      }
+    } 
+
+    /// <summary>
+    /// Gets the collection of IDs of inactive <see cref="WebSocketService"/> objects
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </summary>
+    /// <value>
+    /// An IEnumerable&lt;string&gt; that contains the collection of IDs of inactive <see cref="WebSocketService"/> objects.
+    /// </value>
+    public IEnumerable<string> InactiveIDs {
+      get {
+        return from result in Broadping(String.Empty)
+               where !result.Value
+               select result.Key;
+      }
+    }
+
+    /// <summary>
+    /// Gets the collection of IDs of <see cref="WebSocketService"/> objects
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </summary>
+    /// <value>
+    /// An IEnumerable&lt;string&gt; that contains the collection of IDs of <see cref="WebSocketService"/> objects.
+    /// </value>
+    public IEnumerable<string> IDs {
+      get {
+        lock (_syncRoot)
+        {
+          return _services.Keys;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether the <see cref="WebSocketServiceManager"/> cleans up
+    /// the inactive <see cref="WebSocketService"/> objects periodically.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if the <see cref="WebSocketServiceManager"/> cleans up the inactive <see cref="WebSocketService"/> objects
+    /// every 60 seconds; otherwise, <c>false</c>.
+    /// </value>
+    public bool Sweeped {
+      get {
+        return _sweepTimer.Enabled;
+      }
+
+      internal set {
+        if (value && !_isStopped)
+          startSweepTimer();
+
+        if (!value)
+          stopSweepTimer();
+      }
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private void broadcast(byte[] data)
+    {
+      lock (_syncRoot)
+      {
+        foreach (var service in _services.Values)
+          service.Send(data);
+      }
+    }
+
+    private void broadcast(string data)
+    {
+      lock (_syncRoot)
+      {
+        foreach (var service in _services.Values)
+          service.Send(data);
+      }
+    }
+
+    private void broadcastAsync(byte[] data)
+    {
+      var copied   = copy();
+      var services = copied.Values.GetEnumerator();
+
+      Action completed = null;
+      completed = () =>
+      {
+        if (services.MoveNext())
+          services.Current.SendAsync(data, completed);
+      };
+
+      if (services.MoveNext())
+        services.Current.SendAsync(data, completed);
+    }
+
+    private void broadcastAsync(string data)
+    {
+      var copied   = copy();
+      var services = copied.Values.GetEnumerator();
+
+      Action completed = null;
+      completed = () =>
+      {
+        if (services.MoveNext())
+          services.Current.SendAsync(data, completed);
+      };
+
+      if (services.MoveNext())
+        services.Current.SendAsync(data, completed);
+    }
+
+    private Dictionary<string, WebSocketService> copy()
+    {
+      lock (_syncRoot)
+      {
+        return new Dictionary<string, WebSocketService>(_services);
+      }
+    }
+
+    private string createID()
+    {
+      return Guid.NewGuid().ToString("N");
+    }
+
+    private void setSweepTimer()
+    {
+      _sweepTimer = new Timer(60 * 1000);
+      _sweepTimer.Elapsed += (sender, e) =>
+      {
+        Sweep();
+      };
+    }
+
+    private void startSweepTimer()
+    {
+      if (!Sweeped)
+        _sweepTimer.Start();
+    }
+
+    private void stop(ushort code, string reason, bool ignoreArgs)
+    {
+      stopSweepTimer();
+      lock (_syncRoot)
+      {
+        if (_isStopped)
+          return;
+
+        _isStopped = true;
+        foreach (var service in copy().Values)
+          if (ignoreArgs)
+            service.Stop();
+          else
+            service.Stop(code, reason);
+      }
+    }
+
+    private void stopSweepTimer()
+    {
+      if (Sweeped)
+        _sweepTimer.Stop();
+    }
+
+    #endregion
+
+    #region Internal Methods
+
+    internal string Add(WebSocketService service)
+    {
+      lock (_syncRoot)
+      {
+        if (_isStopped)
+          return null;
+
+        var id = createID();
+        _services.Add(id, service);
+
+        return id;
+      }
+    }
+
+    internal bool Remove(string id)
+    {
+      lock (_syncRoot)
+      {
+        return _services.Remove(id);
+      }
+    }
+
+    internal void Stop()
+    {
+      stop(0, null, true);
+    }
+
+    internal void Stop(ushort code, string reason)
+    {
+      stop(code, reason, false);
+    }
+
+    internal void Stop(CloseStatusCode code, string reason)
+    {
+      Stop((ushort)code, reason);
+    }
+
+    #endregion
+
+    #region Public Methods
+
+    /// <summary>
+    /// Broadcasts the specified array of <see cref="byte"/> to the clients of every <see cref="WebSocketService"/>
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </summary>
+    /// <param name="data">
+    /// An array of <see cref="byte"/> to broadcast.
+    /// </param>
+    public void Broadcast(byte[] data)
+    {
+      if (_isStopped)
+        broadcast(data);
+      else
+        broadcastAsync(data);
+    }
+
+    /// <summary>
+    /// Broadcasts the specified <see cref="string"/> to the clients of every <see cref="WebSocketService"/>
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </summary>
+    /// <param name="data">
+    /// A <see cref="string"/> to broadcast.
+    /// </param>
+    public void Broadcast(string data)
+    {
+      if (_isStopped)
+        broadcast(data);
+      else
+        broadcastAsync(data);
+    }
+
+    /// <summary>
+    /// Pings with the specified <see cref="string"/> to the clients of every <see cref="WebSocketService"/>
+    /// managed by the <see cref="WebSocketServiceManager"/>.
+    /// </summary>
+    /// <returns>
+    /// A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+    /// indicating whether each <see cref="WebSocketService"/> 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)
+    {
+      var result = new Dictionary<string, bool>();
+      foreach (var session in copy())
+        result.Add(session.Key, session.Value.Ping(message));
+
+      return result;
+    }
+
+    /// <summary>
+    /// Cleans up the inactive <see cref="WebSocketService"/> objects.
+    /// </summary>
+    public void Sweep()
+    {
+      if (_isStopped || _isSweeping || Count == 0)
+        return;
+
+      lock (_forSweep)
+      {
+        _isSweeping = true;
+        foreach (var id in InactiveIDs)
+        {
+          lock (_syncRoot)
+          {
+            if (_isStopped)
+            {
+              _isSweeping = false;
+              return;
+            }
+
+            WebSocketService service;
+            if (TryGetWebSocketService(id, out service))
+              service.Stop(CloseStatusCode.ABNORMAL, String.Empty);
+          }
+        }
+
+        _isSweeping = false;
+      }
+    }
+
+    /// <summary>
+    /// Tries to get the <see cref="WebSocketService"/> associated with the specified <paramref name="id"/>.
+    /// </summary>
+    /// <returns>
+    /// <c>true</c> if the <see cref="WebSocketServiceManager"/> manages the <see cref="WebSocketService"/> with the specified <paramref name="id"/>; otherwise, <c>false</c>.
+    /// </returns>
+    /// <param name="id">
+    /// A <see cref="string"/> that contains the ID to find.
+    /// </param>
+    /// <param name="service">
+    /// When this method returns, contains the <see cref="WebSocketService"/> with the specified <paramref name="id"/>, if the <paramref name="id"/> is found; otherwise, <see langword="null"/>.
+    /// </param>
+    public bool TryGetWebSocketService(string id, out WebSocketService service)
+    {
+      lock (_syncRoot)
+      {
+        return _services.TryGetValue(id, out service);
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
index 44c92fba..88aef5a6 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 5bcb9896..a12b5378 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_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll
index ea398411..de5c600d 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 0ca5374a..23d49497 100644
--- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
+++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
@@ -1061,7 +1061,7 @@
             on the specified <paramref name="address" /> and <paramref name="port" />.
             </summary>
             <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1073,7 +1073,7 @@
             on the specified <paramref name="address" />, <paramref name="port" /> and <paramref name="secure" />.
             </summary>
             <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1084,18 +1084,18 @@
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServer.ServicePaths">
             <summary>
-            Gets the paths associated with the each WebSocket services.
+            Gets the collection of paths associated with the every WebSocket services that the server provides.
             </summary>
             <value>
-            An IEnumerable&lt;string&gt; that contains the paths.
+            An IEnumerable&lt;string&gt; that contains the collection of paths.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServer.Sweeped">
             <summary>
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </summary>
             <value>
-                <c>true</c> if the server cleans up the inactive client; otherwise, <c>false</c>.
+                <c>true</c> if the server cleans up the inactive clients every 60 seconds; otherwise, <c>false</c>.
             </value>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.AcceptWebSocket(WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext)">
@@ -1103,7 +1103,7 @@
             Accepts a WebSocket connection.
             </summary>
             <param name="context">
-            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains the WebSocket connection request objects.
             </param>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServer.AddService``1(System.String)">
@@ -1111,10 +1111,10 @@
             Adds a WebSocket service.
             </summary>
             <param name="absPath">
-            A <see cref="T:System.String" /> that contains an absolute path associated with a WebSocket service.
+            A <see cref="T:System.String" /> that contains an absolute path associated with the WebSocket service.
             </param>
             <typeparam name="T">
-            The type of a WebSocket service. The T must inherit the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
+            The type of the 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)">
@@ -1156,28 +1156,28 @@
             Gets the sessions to the WebSocket service.
             </summary>
             <value>
-            A <see cref="T:WebSocketSharp.Server.SessionManager" /> that contains the sessions to the WebSocket service.
+            A <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> 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.
+            Gets the ID of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
             <value>
-            A <see cref="T:System.String" /> that contains a ID.
+            A <see cref="T:System.String" /> that contains an 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" />.
+            Gets a value indicating whether the <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>.
+                <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance is bound to a <see cref="T:WebSocketSharp.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.
+            Occurs when the 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.
@@ -1185,7 +1185,7 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketService.OnError(WebSocketSharp.ErrorEventArgs)">
             <summary>
-            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> gets an error.
+            Occurs when the 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.
@@ -1193,7 +1193,7 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketService.OnMessage(WebSocketSharp.MessageEventArgs)">
             <summary>
-            Occurs when a inner <see cref="T:WebSocketSharp.WebSocket" /> receives a data frame.
+            Occurs when the 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.
@@ -1204,21 +1204,10 @@
             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.
+            Broadcasts the specified array of <see cref="T:System.Byte" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </summary>
             <param name="data">
             An array of <see cref="T:System.Byte" /> to broadcast.
@@ -1226,7 +1215,8 @@
         </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.
+            Broadcasts the specified <see cref="T:System.String" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </summary>
             <param name="data">
             A <see cref="T:System.String" /> to broadcast.
@@ -1234,20 +1224,22 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketService.Broadping">
             <summary>
-            Pings to all clients of the WebSocket service.
+            Pings to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances 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.
+            Pings with the specified <see cref="T:System.String" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances received a Pong in a time.
             </returns>
             <param name="message">
             A <see cref="T:System.String" /> that contains a message.
@@ -1255,18 +1247,18 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketService.Ping">
             <summary>
-            Pings to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            Pings to the client of the <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>.
+                <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance 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.
+            Pings with the specified <see cref="T:System.String" /> to the client of the <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>.
+                <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance receives a Pong in a time; otherwise, <c>false</c>.
             </returns>
             <param name="message">
             A <see cref="T:System.String" /> that contains a message.
@@ -1274,25 +1266,26 @@
         </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.
+            Pings to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
             <returns>
-                <c>true</c> if the WebSocket service receives a Pong in a time; otherwise, <c>false</c>.
+                <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance 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.
+            A <see cref="T:System.String" /> that contains an 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.
+            Pings with the specified <see cref="T:System.String" /> to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
             <returns>
-                <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+                <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance 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.
+            A <see cref="T:System.String" /> that contains an ID that represents the destination for the Ping.
             </param>
             <param name="message">
             A <see cref="T:System.String" /> that contains a message.
@@ -1300,7 +1293,7 @@
         </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.
+            Sends a binary data to the client of the <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.
@@ -1308,7 +1301,7 @@
         </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.
+            Sends a text data to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
             <param name="data">
             A <see cref="T:System.String" /> that contains a text data to send.
@@ -1316,10 +1309,11 @@
         </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.
+            Sends a binary data to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
             <param name="id">
-            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            A <see cref="T:System.String" /> that contains an 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.
@@ -1327,10 +1321,11 @@
         </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.
+            Sends a text data to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
             <param name="id">
-            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            A <see cref="T:System.String" /> that contains an 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.
@@ -1338,31 +1333,31 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketService.Start">
             <summary>
-            Starts a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            Starts the <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.
+            Stops the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
         </member>
-        <member name="M:WebSocketSharp.Server.WebSocketService.Stop(WebSocketSharp.CloseStatusCode,System.String)">
+        <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:WebSocketSharp.CloseStatusCode" /> and <see cref="T:System.String" />.
+            Stops the <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">
-            One of the <see cref="T:WebSocketSharp.CloseStatusCode" /> values that contains a status code indicating the reason for stop.
+            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.Server.WebSocketService.Stop(System.UInt16,System.String)">
+        <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:System.UInt16" /> and <see cref="T:System.String" />.
+            Stops the <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">
-            A <see cref="T:System.UInt16" /> that contains a status code indicating the reason for stop.
+            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.
@@ -1430,7 +1425,7 @@
             on the specified <paramref name="address" />, <paramref name="port" />, <paramref name="absPath" /> and <paramref name="secure" />.
             </summary>
             <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1471,26 +1466,26 @@
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServerBase.Address">
             <summary>
-            Gets the IP address on which to listen for incoming connection attempts.
+            Gets the local IP address on which to listen for incoming connection attempts.
             </summary>
             <value>
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServerBase.IsSecure">
             <summary>
-            Gets a value indicating whether this server provides secure connection.
+            Gets a value indicating whether the server provides secure connection.
             </summary>
             <value>
-                <c>true</c> if this server provides secure connection; otherwise, <c>false</c>.
+                <c>true</c> if the server provides secure connection; otherwise, <c>false</c>.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServerBase.IsSelfHost">
             <summary>
-            Gets a value indicating whether this server is self host.
+            Gets a value indicating whether the server is self host.
             </summary>
             <value>
-                <c>true</c> if this server is self host; otherwise, <c>false</c>.
+                <c>true</c> if the server is self host; otherwise, <c>false</c>.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServerBase.Port">
@@ -1506,7 +1501,7 @@
             Accepts a WebSocket connection.
             </summary>
             <param name="context">
-            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains the WebSocket connection request objects.
             </param>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServerBase.Error(System.String)">
@@ -1536,23 +1531,23 @@
         </member>
         <member name="P:WebSocketSharp.Server.IServiceHost.Sweeped">
             <summary>
-            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service client.
+            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service clients periodically.
             </summary>
             <value>
-                <c>true</c> if the WebSocket service host cleans up the inactive service client; otherwise, <c>false</c>.
+                <c>true</c> if the WebSocket service host cleans up the inactive service clients periodically; otherwise, <c>false</c>.
             </value>
         </member>
         <member name="M:WebSocketSharp.Server.IServiceHost.BindWebSocket(WebSocketSharp.WebSocket)">
             <summary>
-            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> instance to the WebSocket service.
+            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> to the WebSocket service instance.
             </summary>
             <param name="socket">
-            An <see cref="T:WebSocketSharp.WebSocket" /> to bind.
+            A <see cref="T:WebSocketSharp.WebSocket" /> to bind.
             </param>
         </member>
         <member name="M:WebSocketSharp.Server.IServiceHost.Broadcast(System.String)">
             <summary>
-            Broadcasts the specified <see cref="T:System.String" />.
+            Broadcasts the specified <see cref="T:System.String" /> to all service clients.
             </summary>
             <param name="data">
             A <see cref="T:System.String" /> to broadcast.
@@ -1642,7 +1637,7 @@
             on the specified <paramref name="address" />, <paramref name="port" /> and <paramref name="absPath" />.
             </summary>
             <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1657,7 +1652,7 @@
             on the specified <paramref name="address" />, <paramref name="port" />, <paramref name="absPath" /> and <paramref name="secure" />.
             </summary>
             <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
             <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -1671,10 +1666,10 @@
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServiceHost`1.Sweeped">
             <summary>
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </summary>
             <value>
-                <c>true</c> if the server cleans up the inactive client; otherwise, <c>false</c>.
+                <c>true</c> if the server cleans up the inactive clients every 60 seconds; otherwise, <c>false</c>.
             </value>
         </member>
         <member name="P:WebSocketSharp.Server.WebSocketServiceHost`1.Uri">
@@ -1687,7 +1682,7 @@
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServiceHost`1.WebSocketSharp#Server#IServiceHost#BindWebSocket(WebSocketSharp.WebSocket)">
             <summary>
-            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> instance to the WebSocket service.
+            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> to the WebSocket service instance.
             </summary>
             <param name="socket">
             A <see cref="T:WebSocketSharp.WebSocket" /> to bind.
@@ -1698,7 +1693,7 @@
             Accepts a WebSocket connection.
             </summary>
             <param name="context">
-            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains the WebSocket connection request objects.
             </param>
         </member>
         <member name="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadcast(System.String)">
@@ -1714,8 +1709,8 @@
             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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of session IDs and values
+            indicating whether the server received the Pongs from each clients in a time.
             </returns>
             <param name="message">
             A <see cref="T:System.String" /> that contains a message.
@@ -2257,5 +2252,107 @@
             A <see cref="T:WebSocketSharp.WebSocket" />.
             </value>
         </member>
+        <member name="T:WebSocketSharp.Server.WebSocketServiceManager">
+            <summary>
+            Manages the collection of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </summary>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketServiceManager.ActiveIDs">
+            <summary>
+            Gets the collection of IDs of active <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+            <value>
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of active <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketServiceManager.Count">
+            <summary>
+            Gets the number of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+            <value>
+            An <see cref="T:System.Int32" /> that contains the number of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketServiceManager.InactiveIDs">
+            <summary>
+            Gets the collection of IDs of inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+            <value>
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketServiceManager.IDs">
+            <summary>
+            Gets the collection of IDs of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+            <value>
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Server.WebSocketServiceManager.Sweeped">
+            <summary>
+            Gets a value indicating whether the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> cleans up
+            the inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects periodically.
+            </summary>
+            <value>
+                <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> cleans up the inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            every 60 seconds; otherwise, <c>false</c>.
+            </value>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketServiceManager.Broadcast(System.Byte[])">
+            <summary>
+            Broadcasts the specified array of <see cref="T:System.Byte" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" />
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+            <param name="data">
+            An array of <see cref="T:System.Byte" /> to broadcast.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketServiceManager.Broadcast(System.String)">
+            <summary>
+            Broadcasts the specified <see cref="T:System.String" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" />
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+            <param name="data">
+            A <see cref="T:System.String" /> to broadcast.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketServiceManager.Broadping(System.String)">
+            <summary>
+            Pings with the specified <see cref="T:System.String" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" />
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+            <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <see cref="T:WebSocketSharp.Server.WebSocketService" /> 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.WebSocketServiceManager.Sweep">
+            <summary>
+            Cleans up the inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </summary>
+        </member>
+        <member name="M:WebSocketSharp.Server.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@)">
+            <summary>
+            Tries to get the <see cref="T:WebSocketSharp.Server.WebSocketService" /> associated with the specified <paramref name="id" />.
+            </summary>
+            <returns>
+                <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> manages the <see cref="T:WebSocketSharp.Server.WebSocketService" /> with the specified <paramref name="id" />; otherwise, <c>false</c>.
+            </returns>
+            <param name="id">
+            A <see cref="T:System.String" /> that contains the ID to find.
+            </param>
+            <param name="service">
+            When this method returns, contains the <see cref="T:WebSocketSharp.Server.WebSocketService" /> with the specified <paramref name="id" />, if the <paramref name="id" /> is found; otherwise, <see langword="null" />.
+            </param>
+        </member>
     </members>
 </doc>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/index.html b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/index.html
index 4b4e132c..e526b6ba 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/index.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Net.WebSockets/index.html
@@ -196,7 +196,7 @@
     </div>
     <div class="Remarks">
       <h2 class="Section"> Namespace</h2>
-      <p>The WebSocketSharp.Net.WebSockets namespace provides access to the WebSocket connection request objects sent from the client to the server.</p>
+      <p>The WebSocketSharp.Net.WebSockets namespace contains classes to access to the WebSocket connection request objects.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net/index.html b/websocket-sharp/doc/html/WebSocketSharp.Net/index.html
index 7c0164d4..a8de8d25 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Net/index.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Net/index.html
@@ -196,7 +196,7 @@
     </div>
     <div class="Remarks">
       <h2 class="Section"> Namespace</h2>
-      <p>The WebSocketSharp.Net namespace provides some modified classes in the System.Net namespace (e.g. <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpListenerContext">System.Net.HttpListenerContext</a>) to accept the WebSocket connection request.</p>
+      <p>The WebSocketSharp.Net namespace contains some modified classes and enumerations in the System.Net namespace (e.g. <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpListenerContext">System.Net.HttpListenerContext</a>) to accept the WebSocket connection requests.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/IServiceHost.html b/websocket-sharp/doc/html/WebSocketSharp.Server/IServiceHost.html
index 753666e1..59bdc8fe 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/IServiceHost.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/IServiceHost.html
@@ -240,7 +240,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
                   </i>. 
-            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service client.
+            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service clients periodically.
             </td>
               </tr>
             </table>
@@ -259,7 +259,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.IServiceHost.BindWebSocket(WebSocketSharp.WebSocket)">BindWebSocket</a>
                   </b>(<a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a>)<blockquote>
-            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> instance to the WebSocket service.
+            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to the WebSocket service instance.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -271,7 +271,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.IServiceHost.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 service clients.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -339,7 +339,7 @@
         <h3 id="M:WebSocketSharp.Server.IServiceHost.BindWebSocket(WebSocketSharp.WebSocket)">BindWebSocket Method</h3>
         <blockquote id="M:WebSocketSharp.Server.IServiceHost.BindWebSocket(WebSocketSharp.WebSocket):member">
           <p class="Summary">
-            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> instance to the WebSocket service.
+            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to the WebSocket service 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>BindWebSocket</b> (<a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> socket)</div>
@@ -350,7 +350,7 @@
                 <i>socket</i>
               </dt>
               <dd>
-            An <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to bind.
+            A <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to bind.
             </dd>
             </dl>
           </blockquote>
@@ -366,7 +366,7 @@
         <h3 id="M:WebSocketSharp.Server.IServiceHost.Broadcast(System.String)">Broadcast Method</h3>
         <blockquote id="M:WebSocketSharp.Server.IServiceHost.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 service 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>
@@ -425,13 +425,13 @@
         <h3 id="P:WebSocketSharp.Server.IServiceHost.Sweeped">Sweeped Property</h3>
         <blockquote id="P:WebSocketSharp.Server.IServiceHost.Sweeped:member">
           <p class="Summary">
-            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service client.
+            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service clients periodically.
             </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>Sweeped</b>  { get; set; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.IServiceHost.Sweeped:Value">
-            <tt>true</tt> if the WebSocket service host cleans up the inactive service client; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the WebSocket service host cleans up the inactive service clients periodically; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.IServiceHost.Sweeped:Remarks">
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html
index 1db08742..32e2604e 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServer.html
@@ -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 IP address on which to listen for incoming connection attempts.
+            Gets the local 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 provides secure connection.
+            Gets a value indicating whether the server provides secure connection.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</td>
               </tr>
               <tr valign="top">
@@ -372,7 +372,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 self host.
+            Gets a value indicating whether the server is self host.
              (<i>Inherited from <a href="../WebSocketSharp.Server/WebSocketServerBase.html">WebSocketServerBase</a>.</i>)</td>
               </tr>
               <tr valign="top">
@@ -400,7 +400,7 @@
                   <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 paths associated with the each WebSocket services.
+            Gets the collection of paths associated with the every WebSocket services that the server provides.
             </td>
               </tr>
               <tr valign="top">
@@ -417,7 +417,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
                   </i>. 
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </td>
               </tr>
             </table>
@@ -731,7 +731,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            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.
+            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.
             </dd>
               <dt>
                 <i>port</i>
@@ -765,7 +765,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            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.
+            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.
             </dd>
               <dt>
                 <i>port</i>
@@ -804,7 +804,7 @@
                 <i>context</i>
               </dt>
               <dd>
-            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains a WebSocket connection.
+            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains the WebSocket connection request objects.
             </dd>
             </dl>
           </blockquote>
@@ -831,7 +831,7 @@
                 <i>T</i>
               </dt>
               <dd>
-            The type of a WebSocket service. The T must inherit the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> class.
+            The type of the 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 a 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 the WebSocket service.
             </dd>
             </dl>
           </blockquote>
@@ -885,13 +885,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths">ServicePaths Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths:member">
           <p class="Summary">
-            Gets the paths associated with the each WebSocket services.
+            Gets the collection of paths associated with the every WebSocket services that the server provides.
             </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>ServicePaths</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths:Value">
-            An IEnumerable&lt;string&gt; that contains the paths.
+            An IEnumerable&lt;string&gt; that contains the collection of paths.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServer.ServicePaths:Remarks">
@@ -921,13 +921,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketServer.Sweeped">Sweeped Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketServer.Sweeped:member">
           <p class="Summary">
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </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>Sweeped</b>  { get; set; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServer.Sweeped:Value">
-            <tt>true</tt> if the server cleans up the inactive client; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the server cleans up the inactive clients every 60 seconds; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServer.Sweeped:Remarks">
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServerBase.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServerBase.html
index 58472219..44b518e2 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 IP address on which to listen for incoming connection attempts.
+            Gets the local 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 provides secure connection.
+            Gets a value indicating whether the server provides secure connection.
             </td>
               </tr>
               <tr valign="top">
@@ -324,7 +324,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 self host.
+            Gets a value indicating whether the server is self host.
             </td>
               </tr>
               <tr valign="top">
@@ -569,7 +569,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            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.
+            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.
             </dd>
               <dt>
                 <i>port</i>
@@ -647,7 +647,7 @@
                 <i>context</i>
               </dt>
               <dd>
-            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains a WebSocket connection.
+            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains the WebSocket connection request objects.
             </dd>
             </dl>
           </blockquote>
@@ -663,13 +663,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketServerBase.Address">Address Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketServerBase.Address:member">
           <p class="Summary">
-            Gets the IP address on which to listen for incoming connection attempts.
+            Gets the local 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 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 a local IP address.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.Address:Remarks">
@@ -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 provides secure connection.
+            Gets a value indicating whether the 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 provides secure connection; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the server provides secure connection; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.IsSecure:Remarks">
@@ -750,13 +750,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketServerBase.IsSelfHost">IsSelfHost Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketServerBase.IsSelfHost:member">
           <p class="Summary">
-            Gets a value indicating whether this server is self host.
+            Gets a value indicating whether the server is self host.
             </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>IsSelfHost</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.IsSelfHost:Value">
-            <tt>true</tt> if this server is self host; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the server is self host; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServerBase.IsSelfHost:Remarks">
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html
index 9d583ec0..aac17ad9 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketService.html
@@ -264,7 +264,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
                   </i>. 
-            Gets the ID of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Gets the ID of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
             </td>
               </tr>
               <tr valign="top">
@@ -278,7 +278,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
                   </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>.
+            Gets a value indicating whether the <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>
@@ -311,7 +311,7 @@
                 </td>
                 <td>
                   <i>
-                    <a href="../WebSocketSharp.Server/SessionManager.html">SessionManager</a>
+                    <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketServiceManager</a>
                   </i>. 
             Gets the sessions to the WebSocket service.
             </td>
@@ -323,19 +323,6 @@
         <div class="SectionBox" id="Public Methods">
           <div class="SubsectionBox">
             <table class="TypeMembers">
-              <tr valign="top">
-                <td>
-                  <div>
-                  </div>
-                </td>
-                <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>
-            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>
                   <div>
@@ -345,7 +332,8 @@
                   <b>
                     <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.
+            Broadcasts the specified array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</a>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -357,7 +345,8 @@
                   <b>
                     <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.
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</a>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -369,7 +358,8 @@
                   <b>
                     <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.
+            Pings to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</a>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -381,7 +371,8 @@
                   <b>
                     <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.
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</a>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -393,7 +384,7 @@
                   <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>
-            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Pings to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -405,7 +396,7 @@
                   <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>
-            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.
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -417,7 +408,8 @@
                   <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>
-            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            Pings to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -429,8 +421,8 @@
                   <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>
-            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.
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -442,7 +434,7 @@
                   <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>
-            Sends a binary data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Sends a binary data to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -454,7 +446,7 @@
                   <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>
-            Sends a text data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Sends a text data to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -466,7 +458,8 @@
                   <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>
-            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.
+            Sends a binary data to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -478,7 +471,8 @@
                   <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>
-            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.
+            Sends a text data to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -490,7 +484,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Start">Start</a>
                   </b>()<blockquote>
-            Starts a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Starts the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -502,7 +496,7 @@
                   <b>
                     <a href="#M:WebSocketSharp.Server.WebSocketService.Stop">Stop</a>
                   </b>()<blockquote>
-            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Stops the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -514,7 +508,7 @@
                   <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>
-            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>.
+            Stops the <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">
@@ -526,7 +520,7 @@
                   <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>
-            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>.
+            Stops the <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>
@@ -545,7 +539,7 @@
                   <b>
                     <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.
+            Occurs when the 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">
@@ -557,7 +551,7 @@
                   <b>
                     <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.
+            Occurs when the inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> gets an error.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -569,7 +563,7 @@
                   <b>
                     <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.
+            Occurs when the inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> receives a data frame.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -638,44 +632,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.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">
-            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>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Bind(WebSocketSharp.WebSocket,WebSocketSharp.Server.SessionManager):Parameters">
-            <dl>
-              <dt>
-                <i>socket</i>
-              </dt>
-              <dd>
-            A <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to bind to the WebSocketService.
-            </dd>
-              <dt>
-                <i>sessions</i>
-              </dt>
-              <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>
-          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Bind(WebSocketSharp.WebSocket,WebSocketSharp.Server.SessionManager):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.Bind(WebSocketSharp.WebSocket,WebSocketSharp.Server.SessionManager):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.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.
+            Broadcasts the specified array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</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>Broadcast</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[] data)</div>
@@ -702,7 +663,8 @@
         <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.
+            Broadcasts the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</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>Broadcast</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> data)</div>
@@ -729,14 +691,15 @@
         <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.
+            Pings to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</a>.
             </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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances received a Pong in a time.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping:Remarks">
@@ -750,7 +713,8 @@
         <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.
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances
+            in the <a href="../WebSocketSharp.Server/WebSocketService.html#P:WebSocketSharp.Server.WebSocketService.Sessions">WebSocketService.Sessions</a>.
             </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>
@@ -767,8 +731,8 @@
           </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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instances received a Pong in a time.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketService.Broadping(System.String):Remarks">
@@ -782,13 +746,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketService.ID">ID Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketService.ID:member">
           <p class="Summary">
-            Gets the ID of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Gets the ID of the <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">
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a ID.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an ID.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketService.ID:Remarks">
@@ -802,13 +766,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketService.IsBound">IsBound Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketService.IsBound:member">
           <p class="Summary">
-            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>.
+            Gets a value indicating whether the <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">
-            <tt>true</tt> if the WebSocketService is bound to a WebSocket; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance is bound to a <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a>; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketService.IsBound:Remarks">
@@ -822,7 +786,7 @@
         <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">
-            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> receives a Close frame or the Stop method is called.
+            Occurs when the 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="../WebSocketSharp/CloseEventArgs.html">WebSocketSharp.CloseEventArgs</a> e)</div>
@@ -849,7 +813,7 @@
         <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">
-            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> gets an error.
+            Occurs when the 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="../WebSocketSharp/ErrorEventArgs.html">WebSocketSharp.ErrorEventArgs</a> e)</div>
@@ -876,7 +840,7 @@
         <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">
-            Occurs when a inner <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> receives a data frame.
+            Occurs when the 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="../WebSocketSharp/MessageEventArgs.html">WebSocketSharp.MessageEventArgs</a> e)</div>
@@ -919,13 +883,13 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Ping">Ping Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Ping:member">
           <p class="Summary">
-            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Pings to the client of the <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">
-            <tt>true</tt> if the WebSocketService receives a Pong in a time; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance 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">
@@ -939,7 +903,7 @@
         <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">
-            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.
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of the <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>
@@ -956,7 +920,7 @@
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.Ping(System.String):Returns">
-            <tt>true</tt> if the WebSocketService receives a Pong in a time; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance 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">
@@ -970,7 +934,8 @@
         <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">
-            Pings to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance associated with the specified ID.
+            Pings to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </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>
@@ -981,13 +946,13 @@
                 <i>id</i>
               </dt>
               <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.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an 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">
-            <tt>true</tt> if the WebSocket service receives a Pong in a time; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance 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">
@@ -1001,8 +966,8 @@
         <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">
-            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.
+            Pings with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </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>
@@ -1013,7 +978,7 @@
                 <i>id</i>
               </dt>
               <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.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an ID that represents the destination for the Ping.
             </dd>
               <dt>
                 <i>message</i>
@@ -1025,7 +990,7 @@
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketService.PingTo(System.String,System.String):Returns">
-            <tt>true</tt> if the WebSocketService receives a Pong in a time; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance 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">
@@ -1059,7 +1024,7 @@
         <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">
-            Sends a binary data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Sends a binary data to the client of the <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>
@@ -1086,7 +1051,7 @@
         <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">
-            Sends a text data to the client of a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Sends a text data to the client of the <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>
@@ -1113,7 +1078,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">
-            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.
+            Sends a binary data to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </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>
@@ -1124,7 +1090,7 @@
                 <i>id</i>
               </dt>
               <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.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an ID that represents the destination for the data.
             </dd>
               <dt>
                 <i>data</i>
@@ -1146,7 +1112,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">
-            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.
+            Sends a text data to the client of the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance
+            associated with the specified <i>id</i>.
             </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>
@@ -1157,7 +1124,7 @@
                 <i>id</i>
               </dt>
               <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.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains an ID that represents the destination for the data.
             </dd>
               <dt>
                 <i>data</i>
@@ -1182,10 +1149,10 @@
             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>
+          <div class="Signature">protected <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketServiceManager</a> <b>Sessions</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketService.Sessions:Value">
-            A <a href="../WebSocketSharp.Server/SessionManager.html">WebSocketSharp.Server.SessionManager</a> that contains the sessions to the WebSocket service.
+            A <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</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">
@@ -1199,7 +1166,7 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Start">Start Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Start:member">
           <p class="Summary">
-            Starts a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Starts the <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>
@@ -1215,7 +1182,7 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketService.Stop">Stop Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketService.Stop:member">
           <p class="Summary">
-            Stops a <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> instance.
+            Stops the <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>
@@ -1231,7 +1198,7 @@
         <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">
-            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>.
+            Stops the <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>
@@ -1264,7 +1231,7 @@
         <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">
-            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>.
+            Stops the <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>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html
index 0f706268..95ebc3b7 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceHost`1.html
@@ -431,7 +431,7 @@
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
                   </i>. 
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </td>
               </tr>
               <tr valign="top">
@@ -618,7 +618,7 @@
                   </a>
                 </td>
                 <td>
-            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> instance to the WebSocket service.
+            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to the WebSocket service instance.
             </td>
               </tr>
             </table>
@@ -838,7 +838,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            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.
+            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.
             </dd>
               <dt>
                 <i>port</i>
@@ -878,7 +878,7 @@
                 <i>address</i>
               </dt>
               <dd>
-            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.
+            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.
             </dd>
               <dt>
                 <i>port</i>
@@ -923,7 +923,7 @@
                 <i>context</i>
               </dt>
               <dd>
-            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains a WebSocket connection.
+            A <a href="../WebSocketSharp.Net.WebSockets/TcpListenerWebSocketContext.html">WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext</a> that contains the WebSocket connection request objects.
             </dd>
             </dl>
           </blockquote>
@@ -983,8 +983,8 @@
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadping(System.String):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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of session IDs and values
+            indicating whether the server received the Pongs from each clients in a time.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceHost`1.Broadping(System.String):Remarks">
@@ -1014,13 +1014,13 @@
         <h3 id="P:WebSocketSharp.Server.WebSocketServiceHost`1.Sweeped">Sweeped Property</h3>
         <blockquote id="P:WebSocketSharp.Server.WebSocketServiceHost`1.Sweeped:member">
           <p class="Summary">
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </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>Sweeped</b>  { get; set; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServiceHost`1.Sweeped:Value">
-            <tt>true</tt> if the server cleans up the inactive client; otherwise, <tt>false</tt>.
+            <tt>true</tt> if the server cleans up the inactive clients every 60 seconds; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServiceHost`1.Sweeped:Remarks">
@@ -1054,7 +1054,7 @@
         <h3 id="M:WebSocketSharp.Server.WebSocketServiceHost`1.WebSocketSharp#Server#IServiceHost#BindWebSocket(WebSocketSharp.WebSocket)">WebSocketSharp.Server.IServiceHost.BindWebSocket Method</h3>
         <blockquote id="M:WebSocketSharp.Server.WebSocketServiceHost`1.WebSocketSharp#Server#IServiceHost#BindWebSocket(WebSocketSharp.WebSocket):member">
           <p class="Summary">
-            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> instance to the WebSocket service.
+            Binds the specified <a href="../WebSocketSharp/WebSocket.html">WebSocketSharp.WebSocket</a> to the WebSocket service instance.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceManager.html b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceManager.html
new file mode 100644
index 00000000..db610ae6
--- /dev/null
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/WebSocketServiceManager.html
@@ -0,0 +1,672 @@
+<html>
+  <head>
+    <title>WebSocketSharp.Server.WebSocketServiceManager</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <style>
+      a { text-decoration: none }
+
+      div.SideBar {
+        padding-left: 1em;
+        padding-right: 1em;
+        right: 0;
+        float: right;
+        border: thin solid black;
+        background-color: #f2f2f2;
+      }
+    
+      .CollectionTitle { font-weight: bold }
+      .PageTitle { font-size: 150%; font-weight: bold }
+
+      .Summary { }
+      .Signature { }          
+      .Remarks { }
+      .Members { }
+      .Copyright { }
+      
+      .Section { font-size: 125%; font-weight: bold }
+      p.Summary {
+        margin-left: 1em;
+      }
+      .SectionBox { margin-left: 2em }
+      .NamespaceName { font-size: 105%; font-weight: bold }
+      .NamespaceSumary { }
+      .MemberName { font-size: 115%; font-weight: bold; margin-top: 1em }
+      .Subsection { font-size: 105%; font-weight: bold }
+      .SubsectionBox { margin-left: 2em; margin-bottom: 1em }
+
+      .CodeExampleTable { background-color: #f5f5dd; border: thin solid black; padding: .25em; }
+      
+      .TypesListing {
+        border-collapse: collapse;
+      }
+
+      td {
+        vertical-align: top;
+      }
+      th {
+        text-align: left;
+      }
+
+      .TypesListing td { 
+        margin: 0px;  
+        padding: .25em;
+        border: solid gray 1px;
+      }
+
+      .TypesListing th { 
+        margin: 0px;  
+        padding: .25em;
+        background-color: #f2f2f2;
+        border: solid gray 1px;
+      }
+
+      div.Footer {
+        border-top: 1px solid gray;
+        margin-top: 1.5em;
+        padding-top: 0.6em;
+        text-align: center;
+        color: gray;
+      }
+
+      span.NotEntered /* Documentation for this section has not yet been entered */ {
+        font-style: italic;
+        color: red;	
+      }
+
+      div.Header {
+        background: #B0C4DE;
+        border: double;
+        border-color: white;
+        border-width: 7px;
+        padding: 0.5em;
+      }
+
+      div.Header * {
+        font-size: smaller;
+      }
+
+      div.Note {
+      }
+
+      i.ParamRef {
+      }
+
+      i.subtitle {
+      }
+
+      ul.TypeMembersIndex {
+        text-align: left;
+        background: #F8F8F8;
+      }
+
+      ul.TypeMembersIndex li {
+        display: inline;
+        margin:  0.5em;
+      }
+
+      table.HeaderTable {
+      }
+
+      table.SignatureTable {
+      }
+
+      table.Documentation, table.Enumeration, table.TypeDocumentation {
+        border-collapse: collapse;
+        width: 100%;
+      }
+
+      table.Documentation tr th, table.TypeMembers tr th, table.Enumeration tr th, table.TypeDocumentation tr th {
+        background: whitesmoke;
+        padding: 0.8em;
+        border: 1px solid gray;
+        text-align: left;
+        vertical-align: bottom;
+      }
+
+      table.Documentation tr td, table.TypeMembers tr td, table.Enumeration tr td, table.TypeDocumentation tr td {
+        padding: 0.5em;
+        border: 1px solid gray;
+        text-align: left;
+        vertical-align: top;
+      }
+
+      table.TypeMembers {
+        border: 1px solid #C0C0C0;
+        width: 100%;
+      }
+
+      table.TypeMembers tr td {
+        background: #F8F8F8;
+        border: white;
+      }
+
+      table.Documentation {
+      }
+
+      table.TypeMembers {
+      }
+
+      div.CodeExample {
+        width: 100%;
+        border: 1px solid #DDDDDD;
+        background-color: #F8F8F8;
+      }
+
+      div.CodeExample p {
+        margin: 0.5em;
+        border-bottom: 1px solid #DDDDDD;
+      }
+
+      div.CodeExample div {
+        margin: 0.5em;
+      }
+
+      h4 {
+        margin-bottom: 0;
+      }
+
+      div.Signature {
+        border: 1px solid #C0C0C0;
+        background: #F2F2F2;
+        padding: 1em;
+      }
+    </style>
+    <script type="text/JavaScript">
+      function toggle_display (block) {
+        var w = document.getElementById (block);
+        var t = document.getElementById (block + ":toggle");
+        if (w.style.display == "none") {
+          w.style.display = "block";
+          t.innerHTML = "⊟";
+        } else {
+          w.style.display = "none";
+          t.innerHTML = "⊞";
+        }
+      }
+    </script>
+  </head>
+  <body>
+    <div class="CollectionTitle">
+      <a href="../index.html">websocket-sharp</a> : <a href="index.html">WebSocketSharp.Server Namespace</a></div>
+    <div class="SideBar">
+      <p>
+        <a href="#T:WebSocketSharp.Server.WebSocketServiceManager">Overview</a>
+      </p>
+      <p>
+        <a href="#T:WebSocketSharp.Server.WebSocketServiceManager:Signature">Signature</a>
+      </p>
+      <p>
+        <a href="#T:WebSocketSharp.Server.WebSocketServiceManager:Docs">Remarks</a>
+      </p>
+      <p>
+        <a href="#Members">Members</a>
+      </p>
+      <p>
+        <a href="#T:WebSocketSharp.Server.WebSocketServiceManager:Members">Member Details</a>
+      </p>
+    </div>
+    <h1 class="PageTitle" id="T:WebSocketSharp.Server.WebSocketServiceManager">WebSocketServiceManager  Class</h1>
+    <p class="Summary" id="T:WebSocketSharp.Server.WebSocketServiceManager:Summary">
+            Manages the collection of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </p>
+    <div id="T:WebSocketSharp.Server.WebSocketServiceManager:Signature">
+      <h2>Syntax</h2>
+      <div class="Signature">public class  <b>WebSocketServiceManager</b></div>
+    </div>
+    <div class="Remarks" id="T:WebSocketSharp.Server.WebSocketServiceManager:Docs">
+      <h2 class="Section">Remarks</h2>
+      <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketServiceManager:Docs:Remarks">
+        <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+      </div>
+      <h2 class="Section">Requirements</h2>
+      <div class="SectionBox" id="T:WebSocketSharp.Server.WebSocketServiceManager:Docs:Version Information">
+        <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
+      <h2 class="Section" id="Members">Members</h2>
+      <div class="SectionBox" id="_Members">
+        <p>
+								See Also: Inherited members from
+								<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a>.
+							</p>
+        <h2 class="Section">Public Properties</h2>
+        <div class="SectionBox" id="Public Properties">
+          <div class="SubsectionBox">
+            <table class="TypeMembers">
+              <tr valign="top">
+                <td>[read-only]<div></div></td>
+                <td>
+                  <b>
+                    <a href="#P:WebSocketSharp.Server.WebSocketServiceManager.ActiveIDs">ActiveIDs</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 collection of IDs of active <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>[read-only]<div></div></td>
+                <td>
+                  <b>
+                    <a href="#P:WebSocketSharp.Server.WebSocketServiceManager.Count">Count</a>
+                  </b>
+                </td>
+                <td>
+                  <i>
+                    <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>
+                  </i>. 
+            Gets the number of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>[read-only]<div></div></td>
+                <td>
+                  <b>
+                    <a href="#P:WebSocketSharp.Server.WebSocketServiceManager.IDs">IDs</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 collection of IDs of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>[read-only]<div></div></td>
+                <td>
+                  <b>
+                    <a href="#P:WebSocketSharp.Server.WebSocketServiceManager.InactiveIDs">InactiveIDs</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 collection of IDs of inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>[read-only]<div></div></td>
+                <td>
+                  <b>
+                    <a href="#P:WebSocketSharp.Server.WebSocketServiceManager.Sweeped">Sweeped</a>
+                  </b>
+                </td>
+                <td>
+                  <i>
+                    <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a>
+                  </i>. 
+            Gets a value indicating whether the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a> cleans up
+            the inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects periodically.
+            </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+        <h2 class="Section">Public Methods</h2>
+        <div class="SectionBox" id="Public Methods">
+          <div class="SubsectionBox">
+            <table class="TypeMembers">
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="#M:WebSocketSharp.Server.WebSocketServiceManager.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 the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a>
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </blockquote></td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="#M:WebSocketSharp.Server.WebSocketServiceManager.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 the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a>
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </blockquote></td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="#M:WebSocketSharp.Server.WebSocketServiceManager.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 the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a>
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </blockquote></td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="#M:WebSocketSharp.Server.WebSocketServiceManager.Sweep">Sweep</a>
+                  </b>()<blockquote>
+            Cleans up the inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </blockquote></td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>
+                  </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="#M:WebSocketSharp.Server.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@)">TryGetWebSocketService</a>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <i>out</i> <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketService</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Tries to get the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> associated with the specified <i>id</i>.
+            </blockquote></td>
+              </tr>
+            </table>
+          </div>
+        </div>
+        <h2 class="Section">Extension Methods</h2>
+        <div class="SectionBox" id="Extension Methods">
+          <div class="SubsectionBox">
+            <table class="TypeMembers">
+              <tr valign="top">
+                <td>
+                  <div>static </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="../WebSocketSharp/Ext.html#M:WebSocketSharp.Ext.IsNull``1(``0)">IsNull&lt;T&gt;</a>
+                  </b>(<i>this</i> <i title="&#xA;            The type of the  parameter.&#xA;            ">T</i>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Determines whether the specified object is <tt>null</tt>.
+            </blockquote></td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <div>static </div>
+                </td>
+                <td colspan="2">
+                  <b>
+                    <a href="../WebSocketSharp/Ext.html#M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action)">IsNullDo&lt;T&gt;</a>
+                  </b>(<i>this</i> <i title="&#xA;            The type of the  parameter.&#xA;            ">T</i>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action">Action</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Determines whether the specified object is <tt>null</tt>.
+            And invokes the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action">Action</a> delegate if the specified object is <tt>null</tt>.
+            </blockquote></td>
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="Members" id="T:WebSocketSharp.Server.WebSocketServiceManager:Members">
+      <h2 class="Section" id="MemberDetails">Member Details</h2>
+      <div class="SectionBox" id="_MemberDetails">
+        <h3 id="P:WebSocketSharp.Server.WebSocketServiceManager.ActiveIDs">ActiveIDs Property</h3>
+        <blockquote id="P:WebSocketSharp.Server.WebSocketServiceManager.ActiveIDs:member">
+          <p class="Summary">
+            Gets the collection of IDs of active <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </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>ActiveIDs</b>  { get; }</div>
+          <h4 class="Subsection">Value</h4>
+          <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.ActiveIDs:Value">
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of active <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.ActiveIDs: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.WebSocketServiceManager.ActiveIDs: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.WebSocketServiceManager.Broadcast(System.Byte[])">Broadcast Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServiceManager.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 the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a>
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</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>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.WebSocketServiceManager.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.WebSocketServiceManager.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.WebSocketServiceManager.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.WebSocketServiceManager.Broadcast(System.String)">Broadcast Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServiceManager.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 the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a>
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</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>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.WebSocketServiceManager.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.WebSocketServiceManager.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.WebSocketServiceManager.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.WebSocketServiceManager.Broadping(System.String)">Broadping Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServiceManager.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 the clients of every <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a>
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </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.WebSocketServiceManager.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.WebSocketServiceManager.Broadping(System.String):Returns">
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> received a Pong in a time.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceManager.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.WebSocketServiceManager.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.WebSocketServiceManager.Count">Count Property</h3>
+        <blockquote id="P:WebSocketSharp.Server.WebSocketServiceManager.Count:member">
+          <p class="Summary">
+            Gets the number of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </p>
+          <h2>Syntax</h2>
+          <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> <b>Count</b>  { get; }</div>
+          <h4 class="Subsection">Value</h4>
+          <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.Count:Value">
+            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> that contains the number of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.Count: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.WebSocketServiceManager.Count: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.WebSocketServiceManager.IDs">IDs Property</h3>
+        <blockquote id="P:WebSocketSharp.Server.WebSocketServiceManager.IDs:member">
+          <p class="Summary">
+            Gets the collection of IDs of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </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>IDs</b>  { get; }</div>
+          <h4 class="Subsection">Value</h4>
+          <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.IDs:Value">
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.IDs: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.WebSocketServiceManager.IDs: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.WebSocketServiceManager.InactiveIDs">InactiveIDs Property</h3>
+        <blockquote id="P:WebSocketSharp.Server.WebSocketServiceManager.InactiveIDs:member">
+          <p class="Summary">
+            Gets the collection of IDs of inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            managed by the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a>.
+            </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>InactiveIDs</b>  { get; }</div>
+          <h4 class="Subsection">Value</h4>
+          <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.InactiveIDs:Value">
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.InactiveIDs: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.WebSocketServiceManager.InactiveIDs: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.WebSocketServiceManager.Sweep">Sweep Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServiceManager.Sweep:member">
+          <p class="Summary">
+            Cleans up the inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </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>Sweep</b> ()</div>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceManager.Sweep: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.WebSocketServiceManager.Sweep: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.WebSocketServiceManager.Sweeped">Sweeped Property</h3>
+        <blockquote id="P:WebSocketSharp.Server.WebSocketServiceManager.Sweeped:member">
+          <p class="Summary">
+            Gets a value indicating whether the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a> cleans up
+            the inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects periodically.
+            </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>Sweeped</b>  { get; }</div>
+          <h4 class="Subsection">Value</h4>
+          <blockquote class="SubsectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.Sweeped:Value">
+            <tt>true</tt> if the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a> cleans up the inactive <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects
+            every 60 seconds; otherwise, <tt>false</tt>.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="P:WebSocketSharp.Server.WebSocketServiceManager.Sweeped: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.WebSocketServiceManager.Sweeped: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.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@)">TryGetWebSocketService Method</h3>
+        <blockquote id="M:WebSocketSharp.Server.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@):member">
+          <p class="Summary">
+            Tries to get the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> associated with the specified <i>id</i>.
+            </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>TryGetWebSocketService</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> id, <i>out</i> <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketService</a> service)</div>
+          <h4 class="Subsection">Parameters</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@):Parameters">
+            <dl>
+              <dt>
+                <i>id</i>
+              </dt>
+              <dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the ID to find.
+            </dd>
+              <dt>
+                <i>service</i>
+              </dt>
+              <dd>
+            When this method returns, contains the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> with the specified <i>id</i>, if the <i>id</i> is found; otherwise, <tt>null</tt>.
+            </dd>
+            </dl>
+          </blockquote>
+          <h4 class="Subsection">Returns</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Server.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@):Returns">
+            <tt>true</tt> if the <a href="../WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketSharp.Server.WebSocketServiceManager</a> manages the <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> with the specified <i>id</i>; otherwise, <tt>false</tt>.
+            </blockquote>
+          <h2 class="Section">Remarks</h2>
+          <div class="SectionBox" id="M:WebSocketSharp.Server.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@):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.WebSocketServiceManager.TryGetWebSocketService(System.String,WebSocketSharp.Server.WebSocketService@):Version Information">
+            <b>Namespace: </b>WebSocketSharp.Server<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
+          <hr size="1" />
+        </blockquote>
+      </div>
+    </div>
+    <hr size="1" />
+    <div class="Copyright">
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Server/index.html b/websocket-sharp/doc/html/WebSocketSharp.Server/index.html
index 9ffd2896..ba1d55b3 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Server/index.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Server/index.html
@@ -196,7 +196,7 @@
     </div>
     <div class="Remarks">
       <h2 class="Section"> Namespace</h2>
-      <p>The WebSocketSharp.Server namespace provides the functions of the server that receives the WebSocket connection requests.</p>
+      <p>The WebSocketSharp.Server namespace contains classes to implement the server that receives the WebSocket connection requests.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
@@ -226,14 +226,6 @@
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </td>
         </tr>
-        <tr valign="top">
-          <td>
-            <a href="./SessionManager.html">SessionManager</a>
-          </td>
-          <td>
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </td>
-        </tr>
         <tr valign="top">
           <td>
             <a href="./WebSocketServer.html">WebSocketServer</a>
@@ -266,6 +258,14 @@
             Provides the functions of the server that receives the WebSocket connection requests.
             </td>
         </tr>
+        <tr valign="top">
+          <td>
+            <a href="./WebSocketServiceManager.html">WebSocketServiceManager</a>
+          </td>
+          <td>
+            Manages the collection of <a href="../WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </td>
+        </tr>
       </table>
     </div>
     <div class="Members">
diff --git a/websocket-sharp/doc/html/WebSocketSharp/index.html b/websocket-sharp/doc/html/WebSocketSharp/index.html
index 4999c417..9baaa747 100644
--- a/websocket-sharp/doc/html/WebSocketSharp/index.html
+++ b/websocket-sharp/doc/html/WebSocketSharp/index.html
@@ -196,7 +196,7 @@
     </div>
     <div class="Remarks">
       <h2 class="Section"> Namespace</h2>
-      <p>The WebSocketSharp namespace provides an implementation of the WebSocket interface.</p>
+      <p>The WebSocketSharp namespace contains classes and enumerations to implement the WebSocket interface.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
diff --git a/websocket-sharp/doc/html/index.html b/websocket-sharp/doc/html/index.html
index 22c62e0f..d8bbfda0 100644
--- a/websocket-sharp/doc/html/index.html
+++ b/websocket-sharp/doc/html/index.html
@@ -190,7 +190,7 @@
     </div>
     <h1 class="PageTitle">websocket-sharp</h1>
     <p class="Summary">
-      <div class="AssemblyRemarks" style="margin-top: 1em; margin-bottom: 1em">A C# implementation of WebSocket protocol client &amp; server.</div>
+      <div class="AssemblyRemarks" style="margin-top: 1em; margin-bottom: 1em">A C# implementation of the WebSocket protocol client &amp; server.</div>
     </p>
     <div>
     </div>
@@ -198,7 +198,7 @@
       <h2 class="Section">
         <a href="WebSocketSharp/index.html">WebSocketSharp Namespace</a>
       </h2>
-      <p>The WebSocketSharp namespace provides an implementation of the WebSocket interface.</p>
+      <p>The WebSocketSharp namespace contains classes and enumerations to implement the WebSocket interface.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
@@ -288,7 +288,7 @@
       <h2 class="Section">
         <a href="WebSocketSharp.Net/index.html">WebSocketSharp.Net Namespace</a>
       </h2>
-      <p>The WebSocketSharp.Net namespace provides some modified classes in the System.Net namespace (e.g. <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpListenerContext">System.Net.HttpListenerContext</a>) to accept the WebSocket connection request.</p>
+      <p>The WebSocketSharp.Net namespace contains some modified classes and enumerations in the System.Net namespace (e.g. <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpListenerContext">System.Net.HttpListenerContext</a>) to accept the WebSocket connection requests.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
@@ -410,7 +410,7 @@
       <h2 class="Section">
         <a href="WebSocketSharp.Net.WebSockets/index.html">WebSocketSharp.Net.WebSockets Namespace</a>
       </h2>
-      <p>The WebSocketSharp.Net.WebSockets namespace provides access to the WebSocket connection request objects sent from the client to the server.</p>
+      <p>The WebSocketSharp.Net.WebSockets namespace contains classes to access to the WebSocket connection request objects.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
@@ -444,7 +444,7 @@
       <h2 class="Section">
         <a href="WebSocketSharp.Server/index.html">WebSocketSharp.Server Namespace</a>
       </h2>
-      <p>The WebSocketSharp.Server namespace provides the functions of the server that receives the WebSocket connection requests.</p>
+      <p>The WebSocketSharp.Server namespace contains classes to implement the server that receives the WebSocket connection requests.</p>
       <table class="TypesListing" style="margin-top: 1em">
         <tr>
           <th>Type</th>
@@ -474,14 +474,6 @@
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
           </td>
         </tr>
-        <tr valign="top">
-          <td>
-            <a href="WebSocketSharp.Server/SessionManager.html">SessionManager</a>
-          </td>
-          <td>
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </td>
-        </tr>
         <tr valign="top">
           <td>
             <a href="WebSocketSharp.Server/WebSocketServer.html">WebSocketServer</a>
@@ -514,6 +506,14 @@
             Provides the functions of the server that receives the WebSocket connection requests.
             </td>
         </tr>
+        <tr valign="top">
+          <td>
+            <a href="WebSocketSharp.Server/WebSocketServiceManager.html">WebSocketServiceManager</a>
+          </td>
+          <td>
+            Manages the collection of <a href="./WebSocketSharp.Server/WebSocketService.html">WebSocketSharp.Server.WebSocketService</a> objects.
+            </td>
+        </tr>
       </table>
     </div>
     <div class="Members">
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/IServiceHost.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/IServiceHost.xml
index 274d20e3..79c90f42 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/IServiceHost.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/IServiceHost.xml
@@ -24,10 +24,10 @@
       </Parameters>
       <Docs>
         <param name="socket">
-            An <see cref="T:WebSocketSharp.WebSocket" /> to bind.
+            A <see cref="T:WebSocketSharp.WebSocket" /> to bind.
             </param>
         <summary>
-            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> instance to the WebSocket service.
+            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> to the WebSocket service instance.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -47,7 +47,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 service clients.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -91,10 +91,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service client.
+            Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service clients periodically.
             </summary>
         <value>
-          <c>true</c> if the WebSocket service host cleans up the inactive service client; otherwise, <c>false</c>.
+          <c>true</c> if the WebSocket service host cleans up the inactive service clients periodically; otherwise, <c>false</c>.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/SessionManager.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/SessionManager.xml.remove
similarity index 100%
rename from websocket-sharp/doc/mdoc/WebSocketSharp.Server/SessionManager.xml
rename to websocket-sharp/doc/mdoc/WebSocketSharp.Server/SessionManager.xml.remove
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml
index c7e6b982..29e0b8af 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServer.xml
@@ -97,7 +97,7 @@
       </Parameters>
       <Docs>
         <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -120,7 +120,7 @@
       </Parameters>
       <Docs>
         <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -147,7 +147,7 @@
       </Parameters>
       <Docs>
         <param name="context">
-            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains the WebSocket connection request objects.
             </param>
         <summary>
             Accepts a WebSocket connection.
@@ -175,10 +175,10 @@
       </Parameters>
       <Docs>
         <typeparam name="T">
-            The type of a WebSocket service. The T must inherit the <see cref="T:WebSocketSharp.Server.WebSocketService" /> class.
+            The type of the 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 a WebSocket service.
+            A <see cref="T:System.String" /> that contains an absolute path associated with the WebSocket service.
             </param>
         <summary>
             Adds a WebSocket service.
@@ -215,10 +215,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets the paths associated with the each WebSocket services.
+            Gets the collection of paths associated with the every WebSocket services that the server provides.
             </summary>
         <value>
-            An IEnumerable&lt;string&gt; that contains the paths.
+            An IEnumerable&lt;string&gt; that contains the collection of paths.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -247,10 +247,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </summary>
         <value>
-          <c>true</c> if the server cleans up the inactive client; otherwise, <c>false</c>.
+          <c>true</c> if the server cleans up the inactive clients every 60 seconds; otherwise, <c>false</c>.
             </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 a539e1af..4375213e 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServerBase.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServerBase.xml
@@ -65,7 +65,7 @@
       </Parameters>
       <Docs>
         <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -109,7 +109,7 @@
       </Parameters>
       <Docs>
         <param name="context">
-            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains the WebSocket connection request objects.
             </param>
         <summary>
             Accepts a WebSocket connection.
@@ -126,10 +126,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets the IP address on which to listen for incoming connection attempts.
+            Gets the local IP address on which to listen for incoming connection attempts.
             </summary>
         <value>
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -180,10 +180,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets a value indicating whether this server provides secure connection.
+            Gets a value indicating whether the server provides secure connection.
             </summary>
         <value>
-          <c>true</c> if this server provides secure connection; otherwise, <c>false</c>.
+          <c>true</c> if the server provides secure connection; otherwise, <c>false</c>.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -197,10 +197,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets a value indicating whether this server is self host.
+            Gets a value indicating whether the server is self host.
             </summary>
         <value>
-          <c>true</c> if this server is self host; otherwise, <c>false</c>.
+          <c>true</c> if the server is self host; 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 30fd92e0..d9ffbc72 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketService.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketService.xml
@@ -29,31 +29,6 @@
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
-    <Member MemberName="Bind">
-      <MemberSignature Language="C#" Value="public void Bind (WebSocketSharp.WebSocket socket, WebSocketSharp.Server.SessionManager sessions);" />
-      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Bind(class WebSocketSharp.WebSocket socket, class WebSocketSharp.Server.SessionManager sessions) cil managed" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Void</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="socket" Type="WebSocketSharp.WebSocket" />
-        <Parameter Name="sessions" Type="WebSocketSharp.Server.SessionManager" />
-      </Parameters>
-      <Docs>
-        <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" />
@@ -69,7 +44,8 @@
             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.
+            Broadcasts the specified array of <see cref="T:System.Byte" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -89,7 +65,8 @@
             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.
+            Broadcasts the specified <see cref="T:System.String" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -104,11 +81,12 @@
       <Parameters />
       <Docs>
         <summary>
-            Pings to all clients of the WebSocket service.
+            Pings to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances received a Pong in a time.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -128,11 +106,12 @@
             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.
+            Pings with the specified <see cref="T:System.String" /> to the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances
+            in the <see cref="P:WebSocketSharp.Server.WebSocketService.Sessions" />.
             </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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <see cref="T:WebSocketSharp.Server.WebSocketService" /> instances received a Pong in a time.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -146,10 +125,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets the ID of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            Gets the ID of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
         <value>
-            A <see cref="T:System.String" /> that contains a ID.
+            A <see cref="T:System.String" /> that contains an ID.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -163,10 +142,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets a value indicating whether a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance is bound to a <see cref="T:WebSocketSharp.WebSocket" />.
+            Gets a value indicating whether the <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>.
+          <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance is bound to a <see cref="T:WebSocketSharp.WebSocket" />; otherwise, <c>false</c>.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -186,7 +165,7 @@
             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.
+            Occurs when the inner <see cref="T:WebSocketSharp.WebSocket" /> receives a Close frame or the Stop method is called.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -206,7 +185,7 @@
             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.
+            Occurs when the inner <see cref="T:WebSocketSharp.WebSocket" /> gets an error.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -226,7 +205,7 @@
             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.
+            Occurs when the inner <see cref="T:WebSocketSharp.WebSocket" /> receives a data frame.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -256,10 +235,10 @@
       <Parameters />
       <Docs>
         <summary>
-            Pings to the client of a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            Pings to the client of the <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>.
+          <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance receives a Pong in a time; otherwise, <c>false</c>.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -279,10 +258,10 @@
             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.
+            Pings with the specified <see cref="T:System.String" /> to the client of the <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>.
+          <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance receives a Pong in a time; otherwise, <c>false</c>.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -299,13 +278,14 @@
       </Parameters>
       <Docs>
         <param name="id">
-            A <see cref="T:System.String" /> that contains a ID that represents the destination for the Ping.
+            A <see cref="T:System.String" /> that contains an 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.
+            Pings to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
         <returns>
-          <c>true</c> if the WebSocket service receives a Pong in a time; otherwise, <c>false</c>.
+          <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance receives a Pong in a time; otherwise, <c>false</c>.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -323,17 +303,17 @@
       </Parameters>
       <Docs>
         <param name="id">
-            A <see cref="T:System.String" /> that contains a ID that represents the destination for the Ping.
+            A <see cref="T:System.String" /> that contains an 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.
+            Pings with the specified <see cref="T:System.String" /> to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
         <returns>
-          <c>true</c> if the WebSocketService receives a Pong in a time; otherwise, <c>false</c>.
+          <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance receives a Pong in a time; otherwise, <c>false</c>.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -370,7 +350,7 @@
             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.
+            Sends a binary data to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -390,7 +370,7 @@
             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.
+            Sends a text data to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -408,13 +388,14 @@
       </Parameters>
       <Docs>
         <param name="id">
-            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            A <see cref="T:System.String" /> that contains an 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.
+            Sends a binary data to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -432,30 +413,31 @@
       </Parameters>
       <Docs>
         <param name="id">
-            A <see cref="T:System.String" /> that contains a ID that represents the destination for the data.
+            A <see cref="T:System.String" /> that contains an 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.
+            Sends a text data to the client of the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance
+            associated with the specified <paramref name="id" />.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="Sessions">
-      <MemberSignature Language="C#" Value="protected WebSocketSharp.Server.SessionManager Sessions { get; }" />
-      <MemberSignature Language="ILAsm" Value=".property instance class WebSocketSharp.Server.SessionManager Sessions" />
+      <MemberSignature Language="C#" Value="protected WebSocketSharp.Server.WebSocketServiceManager Sessions { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class WebSocketSharp.Server.WebSocketServiceManager Sessions" />
       <MemberType>Property</MemberType>
       <ReturnValue>
-        <ReturnType>WebSocketSharp.Server.SessionManager</ReturnType>
+        <ReturnType>WebSocketSharp.Server.WebSocketServiceManager</ReturnType>
       </ReturnValue>
       <Docs>
         <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.
+            A <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> that contains the sessions to the WebSocket service.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -470,7 +452,7 @@
       <Parameters />
       <Docs>
         <summary>
-            Starts a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            Starts the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -485,7 +467,7 @@
       <Parameters />
       <Docs>
         <summary>
-            Stops a <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
+            Stops the <see cref="T:WebSocketSharp.Server.WebSocketService" /> instance.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
@@ -509,7 +491,7 @@
             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" />.
+            Stops the <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>
@@ -533,7 +515,7 @@
             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" />.
+            Stops the <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>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml
index 719a4f21..ecc0cc85 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceHost`1.xml
@@ -149,7 +149,7 @@
       </Parameters>
       <Docs>
         <param name="address">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local 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">
-            A <see cref="T:System.Net.IPAddress" /> that contains an IP address.
+            A <see cref="T:System.Net.IPAddress" /> that contains a local IP address.
             </param>
         <param name="port">
             An <see cref="T:System.Int32" /> that contains a port number.
@@ -206,7 +206,7 @@
       </Parameters>
       <Docs>
         <param name="context">
-            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains a WebSocket connection.
+            A <see cref="T:WebSocketSharp.Net.WebSockets.TcpListenerWebSocketContext" /> that contains the WebSocket connection request objects.
             </param>
         <summary>
             Accepts a WebSocket connection.
@@ -252,8 +252,8 @@
             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.
+            A Dictionary&lt;string, bool&gt; that contains the collection of session IDs and values
+            indicating whether the server received the Pongs from each clients in a time.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -282,10 +282,10 @@
       </ReturnValue>
       <Docs>
         <summary>
-            Gets or sets a value indicating whether the server cleans up the inactive client.
+            Gets or sets a value indicating whether the server cleans up the inactive clients periodically.
             </summary>
         <value>
-          <c>true</c> if the server cleans up the inactive client; otherwise, <c>false</c>.
+          <c>true</c> if the server cleans up the inactive clients every 60 seconds; otherwise, <c>false</c>.
             </value>
         <remarks>To be added.</remarks>
       </Docs>
@@ -322,7 +322,7 @@
             A <see cref="T:WebSocketSharp.WebSocket" /> to bind.
             </param>
         <summary>
-            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> instance to the WebSocket service.
+            Binds the specified <see cref="T:WebSocketSharp.WebSocket" /> to the WebSocket service instance.
             </summary>
         <remarks>To be added.</remarks>
       </Docs>
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceManager.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceManager.xml
new file mode 100644
index 00000000..d3748c47
--- /dev/null
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Server/WebSocketServiceManager.xml
@@ -0,0 +1,220 @@
+<Type Name="WebSocketServiceManager" FullName="WebSocketSharp.Server.WebSocketServiceManager">
+  <TypeSignature Language="C#" Value="public class WebSocketServiceManager" />
+  <TypeSignature Language="ILAsm" Value=".class public auto ansi beforefieldinit WebSocketServiceManager extends System.Object" />
+  <AssemblyInfo>
+    <AssemblyName>websocket-sharp</AssemblyName>
+  </AssemblyInfo>
+  <Base>
+    <BaseTypeName>System.Object</BaseTypeName>
+  </Base>
+  <Interfaces />
+  <Docs>
+    <summary>
+            Manages the collection of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </summary>
+    <remarks>To be added.</remarks>
+  </Docs>
+  <Members>
+    <Member MemberName="ActiveIDs">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;string&gt; ActiveIDs { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;string&gt; ActiveIDs" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.String&gt;</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>
+            Gets the collection of IDs of active <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+        <value>
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of active <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </value>
+        <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 the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" />
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </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 the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" />
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </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 (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 the clients of every <see cref="T:WebSocketSharp.Server.WebSocketService" />
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+        <returns>
+            A Dictionary&lt;string, bool&gt; that contains the collection of IDs and values
+            indicating whether each <see cref="T:WebSocketSharp.Server.WebSocketService" /> received a Pong in a time.
+            </returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Count">
+      <MemberSignature Language="C#" Value="public int Count { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance int32 Count" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Int32</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>
+            Gets the number of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+        <value>
+            An <see cref="T:System.Int32" /> that contains the number of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="IDs">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;string&gt; IDs { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;string&gt; IDs" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.String&gt;</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>
+            Gets the collection of IDs of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+        <value>
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="InactiveIDs">
+      <MemberSignature Language="C#" Value="public System.Collections.Generic.IEnumerable&lt;string&gt; InactiveIDs { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance class System.Collections.Generic.IEnumerable`1&lt;string&gt; InactiveIDs" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Collections.Generic.IEnumerable&lt;System.String&gt;</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>
+            Gets the collection of IDs of inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            managed by the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" />.
+            </summary>
+        <value>
+            An IEnumerable&lt;string&gt; that contains the collection of IDs of inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Sweep">
+      <MemberSignature Language="C#" Value="public void Sweep ();" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance void Sweep() cil managed" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Void</ReturnType>
+      </ReturnValue>
+      <Parameters />
+      <Docs>
+        <summary>
+            Cleans up the inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects.
+            </summary>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="Sweeped">
+      <MemberSignature Language="C#" Value="public bool Sweeped { get; }" />
+      <MemberSignature Language="ILAsm" Value=".property instance bool Sweeped" />
+      <MemberType>Property</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Docs>
+        <summary>
+            Gets a value indicating whether the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> cleans up
+            the inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects periodically.
+            </summary>
+        <value>
+          <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> cleans up the inactive <see cref="T:WebSocketSharp.Server.WebSocketService" /> objects
+            every 60 seconds; otherwise, <c>false</c>.
+            </value>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+    <Member MemberName="TryGetWebSocketService">
+      <MemberSignature Language="C#" Value="public bool TryGetWebSocketService (string id, out WebSocketSharp.Server.WebSocketService service);" />
+      <MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool TryGetWebSocketService(string id, class WebSocketSharp.Server.WebSocketService service) cil managed" />
+      <MemberType>Method</MemberType>
+      <ReturnValue>
+        <ReturnType>System.Boolean</ReturnType>
+      </ReturnValue>
+      <Parameters>
+        <Parameter Name="id" Type="System.String" />
+        <Parameter Name="service" Type="WebSocketSharp.Server.WebSocketService&amp;" RefType="out" />
+      </Parameters>
+      <Docs>
+        <param name="id">
+            A <see cref="T:System.String" /> that contains the ID to find.
+            </param>
+        <param name="service">
+            When this method returns, contains the <see cref="T:WebSocketSharp.Server.WebSocketService" /> with the specified <paramref name="id" />, if the <paramref name="id" /> is found; otherwise, <see langword="null" />.
+            </param>
+        <summary>
+            Tries to get the <see cref="T:WebSocketSharp.Server.WebSocketService" /> associated with the specified <paramref name="id" />.
+            </summary>
+        <returns>
+          <c>true</c> if the <see cref="T:WebSocketSharp.Server.WebSocketServiceManager" /> manages the <see cref="T:WebSocketSharp.Server.WebSocketService" /> with the specified <paramref name="id" />; otherwise, <c>false</c>.
+            </returns>
+        <remarks>To be added.</remarks>
+      </Docs>
+    </Member>
+  </Members>
+</Type>
diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml
index 9a69216d..911504fc 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.34976">
+    <Assembly Name="websocket-sharp" Version="1.0.2.32272">
       <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>
@@ -13,7 +13,7 @@
           <AttributeName>System.Reflection.AssemblyCopyright("sta.blockhead")</AttributeName>
         </Attribute>
         <Attribute>
-          <AttributeName>System.Reflection.AssemblyDescription("A C# implementation of WebSocket protocol client &amp; server")</AttributeName>
+          <AttributeName>System.Reflection.AssemblyDescription("A C# implementation of the WebSocket protocol client &amp; server")</AttributeName>
         </Attribute>
         <Attribute>
           <AttributeName>System.Reflection.AssemblyProduct("websocket-sharp.dll")</AttributeName>
@@ -30,7 +30,7 @@
       </Attributes>
     </Assembly>
   </Assemblies>
-  <Remarks>A C# implementation of WebSocket protocol client &amp; server.</Remarks>
+  <Remarks>A C# implementation of the WebSocket protocol client &amp; server.</Remarks>
   <Copyright>Copyright (c) 2010-2013 sta.blockhead</Copyright>
   <Types>
     <Namespace Name="WebSocketSharp">
@@ -70,11 +70,11 @@
       <Type Name="HttpServer" Kind="Class" />
       <Type Name="IServiceHost" Kind="Interface" />
       <Type Name="ResponseEventArgs" Kind="Class" />
-      <Type Name="SessionManager" Kind="Class" />
       <Type Name="WebSocketServer" Kind="Class" />
       <Type Name="WebSocketServerBase" Kind="Class" />
       <Type Name="WebSocketService" Kind="Class" />
       <Type Name="WebSocketServiceHost`1" DisplayName="WebSocketServiceHost&lt;T&gt;" Kind="Class" />
+      <Type Name="WebSocketServiceManager" Kind="Class" />
     </Namespace>
   </Types>
   <Title>websocket-sharp</Title>
diff --git a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.WebSockets.xml b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.WebSockets.xml
index e694b9a4..603e826b 100644
--- a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.WebSockets.xml
+++ b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.WebSockets.xml
@@ -1,6 +1,6 @@
 <Namespace Name="WebSocketSharp.Net.WebSockets">
   <Docs>
     <summary>To be added.</summary>
-    <remarks>The WebSocketSharp.Net.WebSockets namespace provides access to the WebSocket connection request objects sent from the client to the server.</remarks>
+    <remarks>The WebSocketSharp.Net.WebSockets namespace contains classes to access to the WebSocket connection request objects.</remarks>
   </Docs>
 </Namespace>
diff --git a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.xml b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.xml
index 900265c2..c5a1e31c 100644
--- a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.xml
+++ b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Net.xml
@@ -1,6 +1,6 @@
 <Namespace Name="WebSocketSharp.Net">
   <Docs>
     <summary>To be added.</summary>
-    <remarks>The WebSocketSharp.Net namespace provides some modified classes in the System.Net namespace (e.g. <see cref="T:System.Net.HttpListenerContext"/>) to accept the WebSocket connection request.</remarks>
+    <remarks>The WebSocketSharp.Net namespace contains some modified classes and enumerations in the System.Net namespace (e.g. <see cref="T:System.Net.HttpListenerContext"/>) to accept the WebSocket connection requests.</remarks>
   </Docs>
 </Namespace>
diff --git a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Server.xml b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Server.xml
index 6b67dda9..563ee285 100644
--- a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Server.xml
+++ b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.Server.xml
@@ -1,6 +1,6 @@
 <Namespace Name="WebSocketSharp.Server">
   <Docs>
     <summary>To be added.</summary>
-    <remarks>The WebSocketSharp.Server namespace provides the functions of the server that receives the WebSocket connection requests.</remarks>
+    <remarks>The WebSocketSharp.Server namespace contains classes to implement the server that receives the WebSocket connection requests.</remarks>
   </Docs>
 </Namespace>
diff --git a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.xml b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.xml
index 9dd7c006..9c02bf33 100644
--- a/websocket-sharp/doc/mdoc/ns-WebSocketSharp.xml
+++ b/websocket-sharp/doc/mdoc/ns-WebSocketSharp.xml
@@ -1,6 +1,6 @@
 <Namespace Name="WebSocketSharp">
   <Docs>
     <summary>To be added.</summary>
-    <remarks>The WebSocketSharp namespace provides an implementation of the WebSocket interface.</remarks>
+    <remarks>The WebSocketSharp namespace contains classes and enumerations to implement the WebSocket interface.</remarks>
   </Docs>
 </Namespace>
diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj
index 5b610627..082f197d 100644
--- a/websocket-sharp/websocket-sharp.csproj
+++ b/websocket-sharp/websocket-sharp.csproj
@@ -107,7 +107,6 @@
     <Compile Include="Server\WebSocketServerBase.cs" />
     <Compile Include="Net\Security\SslStream.cs" />
     <Compile Include="Server\IServiceHost.cs" />
-    <Compile Include="Server\SessionManager.cs" />
     <Compile Include="Server\WebSocketServiceHost.cs" />
     <Compile Include="CloseStatusCode.cs" />
     <Compile Include="Fin.cs" />
@@ -120,6 +119,7 @@
     <Compile Include="Net\WebSockets\TcpListenerWebSocketContext.cs" />
     <Compile Include="Net\WebSockets\WebSocketContext.cs" />
     <Compile Include="Server\ServiceHostManager.cs" />
+    <Compile Include="Server\WebSocketServiceManager.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb
index 197c274a..c442e071 100644
Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ