diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe
index f2ea3e55..87511c37 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 1e107adb..38e45ad9 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 6c916f76..f624d82a 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 2fb66402..63eb8ac7 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 e41b6afd..b77cf797 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 cdaf9beb..b38b635c 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 6c916f76..f624d82a 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 2fb66402..63eb8ac7 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 862ed12e..42d38660 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 aa688f7b..c6e86391 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 6c916f76..f624d82a 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 2fb66402..63eb8ac7 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 15d14075..8a4ca324 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 dd578aaa..538dca00 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 6c916f76..f624d82a 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 2fb66402..63eb8ac7 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/Ext.cs b/websocket-sharp/Ext.cs
index 904ca64c..fbbe0a83 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -79,6 +79,29 @@ namespace WebSocketSharp {
 
     #region Internal Method
 
+    internal static bool IsText(this string value)
+    {
+      int len = value.Length;
+      for (int i = 0; i < len; i++)
+      {
+        char c = value[i];
+        if (c < 0x20 && !"\r\n\t".Contains(c))
+          return false;
+
+        if (c == 0x7f)
+          return false;
+
+        if (c == '\n' && ++i < len)
+        {
+          c = value[i];
+          if (!" \t".Contains(c))
+            return false;
+        }
+      }
+
+      return true;
+    }
+
     internal static bool IsToken(this string value)
     {
       foreach (char c in value)
diff --git a/websocket-sharp/Net/WebHeaderCollection.cs b/websocket-sharp/Net/WebHeaderCollection.cs
index 7db31aa1..767d1e09 100644
--- a/websocket-sharp/Net/WebHeaderCollection.cs
+++ b/websocket-sharp/Net/WebHeaderCollection.cs
@@ -1,14 +1,15 @@
 //
 // WebHeaderCollection.cs
-//	Copied from System.Net.WebHeaderCollection
+//	Copied from System.Net.WebHeaderCollection.cs
 //
 // Authors:
 //	Lawrence Pit (loz@cable.a2000.nl)
 //	Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //	Miguel de Icaza (miguel@novell.com)
 //
-// Copyright 2003 Ximian, Inc. (http://www.ximian.com)
-// Copyright 2007 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2003 Ximian, Inc. (http://www.ximian.com)
+// Copyright (c) 2007 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2012-2013 sta.blockhead (sta.blockhead@gmail.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -37,24 +38,30 @@ using System.Collections.Specialized;
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
+using System.Security.Permissions;
 using System.Text;
-    
-// See RFC 2068 par 4.2 Message Headers
-    
+        
 namespace WebSocketSharp.Net {
 
+	/// <summary>
+	/// Provides a collection of the HTTP headers associated with a request or response.
+	/// </summary>
 	[Serializable]
-	[ComVisible(true)]
+	[ComVisible (true)]
 	public class WebHeaderCollection : NameValueCollection, ISerializable
 	{
+		#region Fields
+
 		private static readonly Dictionary<string, bool> multiValue;
 		private static readonly Dictionary<string, bool> restricted;
 		private static readonly Dictionary<string, bool> restricted_response;
 
 		private bool internallyCreated = false;
-		
-		// Static Initializer
-		
+
+		#endregion
+
+		#region Constructors
+
 		static WebHeaderCollection () 
 		{
 			// the list of restricted header names as defined 
@@ -93,12 +100,12 @@ namespace WebSocketSharp.Net {
 			multiValue.Add ("cache-control", true);
 			multiValue.Add ("connection", true);
 			multiValue.Add ("content-encoding", true);
-			multiValue.Add ("content-language", true);			
-			multiValue.Add ("expect", true);		
+			multiValue.Add ("content-language", true);
+			multiValue.Add ("expect", true);
 			multiValue.Add ("if-match", true);
 			multiValue.Add ("if-none-match", true);
 			multiValue.Add ("proxy-authenticate", true);
-			multiValue.Add ("public", true);			
+			multiValue.Add ("public", true);
 			multiValue.Add ("range", true);
 			multiValue.Add ("transfer-encoding", true);
 			multiValue.Add ("upgrade", true);
@@ -111,322 +118,140 @@ namespace WebSocketSharp.Net {
 			multiValue.Add ("set-cookie", true);
 			multiValue.Add ("set-cookie2", true);
 		}
-		
-		// Constructors
 
-		public WebHeaderCollection () { }
-
-		protected WebHeaderCollection (
-			SerializationInfo serializationInfo, 
-			StreamingContext streamingContext)
-		{
-			int count;
-
-			try {
-				count = serializationInfo.GetInt32("Count");
-				for (int i = 0; i < count; i++) 
-					this.Add (serializationInfo.GetString (i.ToString ()),
-						  serializationInfo.GetString ((count + i).ToString ()));
-			} catch (SerializationException){
-				count = serializationInfo.GetInt32("count");
-				for (int i = 0; i < count; i++) 
-					this.Add (serializationInfo.GetString ("k" + i),
-						  serializationInfo.GetString ("v" + i));
-			}
-			
-		}
-		
 		internal WebHeaderCollection (bool internallyCreated)
 		{
 			this.internallyCreated = internallyCreated;
 		}
 
-		// Methods
-		
-		public void Add (string header)
+		/// <summary>
+		/// Initializes a new instance of the <see cref="WebHeaderCollection"/> class
+		/// with the specified <see cref="SerializationInfo"/> and <see cref="StreamingContext"/>.
+		/// </summary>
+		/// <param name="serializationInfo">
+		/// A <see cref="SerializationInfo"/> that holds the serialized object data.
+		/// </param>
+		/// <param name="streamingContext">
+		/// A <see cref="StreamingContext"/> that contains the contextual information about the source or destination.
+		/// </param>
+		protected WebHeaderCollection (
+			SerializationInfo serializationInfo, StreamingContext streamingContext)
 		{
-			if (header == null)
-				throw new ArgumentNullException ("header");
-			int pos = header.IndexOf (':');
-			if (pos == -1)
-				throw new ArgumentException ("no colon found", "header");
-			this.Add (header.Substring (0, pos), 
-				  header.Substring (pos + 1));
-		}
-		
-		public override void Add (string name, string value)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (internallyCreated && IsRestricted (name))
-				throw new ArgumentException ("This header must be modified with the appropiate property.");
-			this.AddWithoutValidate (name, value);
-		}
-
-		protected void AddWithoutValidate (string headerName, string headerValue)
-		{
-			if (!IsHeaderName (headerName))
-				throw new ArgumentException ("invalid header name: " + headerName, "headerName");
-			if (headerValue == null)
-				headerValue = String.Empty;
-			else
-				headerValue = headerValue.Trim ();
-			if (!IsHeaderValue (headerValue))
-				throw new ArgumentException ("invalid header value: " + headerValue, "headerValue");
-			base.Add (headerName, headerValue);			
-		}
-
-		public override string [] GetValues (string header)
-		{
-			if (header == null)
-				throw new ArgumentNullException ("header");
-
-			string [] values = base.GetValues (header);
-			if (values == null || values.Length == 0)
-				return null;
-
-			/*
-			if (IsMultiValue (header)) {
-				values = GetMultipleValues (values);
-			}
-			*/
-
-			return values;
-		}
-
-		public override string[] GetValues (int index)
-		{
-			string[] values = base.GetValues (index);
-			if (values == null || values.Length == 0) {
-				return(null);
-			}
-			
-			return(values);
-		}
-
-		/* Now i wonder why this is here...
-		static string [] GetMultipleValues (string [] values)
-		{
-			ArrayList mvalues = new ArrayList (values.Length);
-			StringBuilder sb = null;
-			for (int i = 0; i < values.Length; ++i) {
-				string val = values [i];
-				if (val.IndexOf (',') == -1) {
-					mvalues.Add (val);
-					continue;
-				}
-
-				if (sb == null)
-					sb = new StringBuilder ();
-
-				bool quote = false;
-				for (int k = 0; k < val.Length; k++) {
-					char c = val [k];
-					if (c == '"') {
-						quote = !quote;
-					} else if (!quote && c == ',') {
-						mvalues.Add (sb.ToString ().Trim ());
-						sb.Length = 0;
-						continue;
-					}
-					sb.Append (c);
-				}
-
-				if (sb.Length > 0) {
-					mvalues.Add (sb.ToString ().Trim ());
-					sb.Length = 0;
-				}
-			}
-
-			return (string []) mvalues.ToArray (typeof (string));
-		}
-		*/
-
-		public static bool IsRestricted (string headerName)
-		{
-			if (headerName == null)
-				throw new ArgumentNullException ("headerName");
-
-			if (headerName == "") // MS throw nullexception here!
-				throw new ArgumentException ("empty string", "headerName");
-
-			if (!IsHeaderName (headerName))
-				throw new ArgumentException ("Invalid character in header");
-
-			return restricted.ContainsKey (headerName);
-		}
-
-		public static bool IsRestricted (string headerName, bool response)
-		{
-			if (String.IsNullOrEmpty (headerName))
-				throw new ArgumentNullException ("headerName");
-
-			if (!IsHeaderName (headerName))
-				throw new ArgumentException ("Invalid character in header");
-
-
-			if (response)
-				return restricted_response.ContainsKey (headerName);
-			return restricted.ContainsKey (headerName);
-		}
-
-		public override void OnDeserialization (object sender)
-		{
-		}
-
-		public override void Remove (string name)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (internallyCreated && IsRestricted (name))
-				throw new ArgumentException ("restricted header");
-			base.Remove (name);
-		}
-
-		public override void Set (string name, string value)
-		{
-			if (name == null)
-				throw new ArgumentNullException ("name");
-			if (internallyCreated && IsRestricted (name))
-				throw new ArgumentException ("restricted header");
-			if (!IsHeaderName (name))
-				throw new ArgumentException ("invalid header name");
-			if (value == null)
-				value = String.Empty;
-			else
-				value = value.Trim ();
-			if (!IsHeaderValue (value))
-				throw new ArgumentException ("invalid header value");
-			base.Set (name, value);			
-		}
-
-		public byte[] ToByteArray ()
-		{
-			return Encoding.UTF8.GetBytes(ToString ());
-		}
-
-		internal string ToStringMultiValue ()
-		{
-			StringBuilder sb = new StringBuilder();
-
-			int count = base.Count;
-			for (int i = 0; i < count ; i++) {
-				string key = GetKey (i);
-				if (IsMultiValue (key)) {
-					foreach (string v in GetValues (i)) {
-						sb.Append (key)
-						  .Append (": ")
-						  .Append (v)
-						  .Append ("\r\n");
-					}
-				} else {
-					sb.Append (key)
-					  .Append (": ")
-					  .Append (Get (i))
-					  .Append ("\r\n");
-				}
-			 }
-			return sb.Append("\r\n").ToString();
-		}
-
-		public override string ToString ()
-		{
-			StringBuilder sb = new StringBuilder();
-
-			int count = base.Count;
-			for (int i = 0; i < count ; i++)
-				sb.Append (GetKey (i))
-				  .Append (": ")
-				  .Append (Get (i))
-				  .Append ("\r\n");
-
-			return sb.Append("\r\n").ToString();
-		}
-
-		void ISerializable.GetObjectData (
-			SerializationInfo serializationInfo,
-			StreamingContext streamingContext)
-		{
-			GetObjectData (serializationInfo, streamingContext);
-		}
-
-		public override void GetObjectData (SerializationInfo serializationInfo, StreamingContext streamingContext)
-		{
-			int count = base.Count;
-			serializationInfo.AddValue ("Count", count);
-			for (int i = 0; i < count; i++) {
-				serializationInfo.AddValue (i.ToString (), GetKey (i));
-				serializationInfo.AddValue ((count + i).ToString (), Get (i));
+			int count;
+			try {
+				count = serializationInfo.GetInt32("Count");
+				for (int i = 0; i < count; i++)
+					this.Add (
+						serializationInfo.GetString (i.ToString ()),
+						serializationInfo.GetString ((count + i).ToString ()));
+			} catch (SerializationException) {
+				count = serializationInfo.GetInt32("count");
+				for (int i = 0; i < count; i++)
+					this.Add (
+						serializationInfo.GetString ("k" + i),
+						serializationInfo.GetString ("v" + i));
 			}
 		}
 
-		public override string[] AllKeys
+		/// <summary>
+		/// Initializes a new instance of the <see cref="WebHeaderCollection"/> class.
+		/// </summary>
+		public WebHeaderCollection ()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets all header names in the collection.
+		/// </summary>
+		/// <value>
+		/// An array of <see cref="string"/> that contains all header names in the collection.
+		/// </value>
+		public override string [] AllKeys
 		{
 			get {
-				return(base.AllKeys);
+				return base.AllKeys;
 			}
 		}
-		
+
+		/// <summary>
+		/// Gets the number of headers in the collection.
+		/// </summary>
+		/// <value>
+		/// An <see cref="int"/> that indicates the number of headers in the collection.
+		/// </value>
 		public override int Count 
 		{
 			get {
-				return(base.Count);
+				return base.Count;
 			}
 		}
 
+		/// <summary>
+		/// Gets or sets the specified request <paramref name="header"/> in the collection.
+		/// </summary>
+		/// <value>
+		/// A <see cref="string"/> that contains the value of the specified request <paramref name="header"/>.
+		/// </value>
+		/// <param name="header">
+		/// A <see cref="HttpRequestHeader"/> that contains a request header name.
+		/// </param>
+		public string this [HttpRequestHeader header]
+		{
+			get {
+				return Get (RequestHeaderToString (header));
+			}
+
+			set {
+				// TODO: Support to throw InvalidOperationException.
+
+				Add (header, value);
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the specified response <paramref name="header"/> in the collection.
+		/// </summary>
+		/// <value>
+		/// A <see cref="string"/> that contains the value of the specified response <paramref name="header"/>.
+		/// </value>
+		/// <param name="header">
+		/// A <see cref="HttpResponseHeader"/> that contains a response header name.
+		/// </param>
+		public string this [HttpResponseHeader header]
+		{
+			get {
+				return Get (ResponseHeaderToString (header));
+			}
+
+			set {
+				// TODO: Support to throw InvalidOperationException.
+
+				Add (header, value);
+			}
+		}
+
+		/// <summary>
+		/// Gets a collection of header names in the collection.
+		/// </summary>
+		/// <value>
+		/// A <see cref="KeysCollection"/> that contains a collection of header names in the collection.
+		/// </value>
 		public override KeysCollection Keys
 		{
 			get {
-				return(base.Keys);
+				return base.Keys;
 			}
 		}
 
-		public override string Get (int index)
-		{
-			return(base.Get (index));
-		}
-		
-		public override string Get (string name)
-		{
-			return(base.Get (name));
-		}
-		
-		public override string GetKey (int index)
-		{
-			return(base.GetKey (index));
-		}
+		#endregion
 
-		public void Add (HttpRequestHeader header, string value)
-		{
-			Add (RequestHeaderToString (header), value);
-		}
+		#region Private Methods
 
-		public void Remove (HttpRequestHeader header)
-		{
-			Remove (RequestHeaderToString (header));
-		}
-
-		public void Set (HttpRequestHeader header, string value)
-		{
-			Set (RequestHeaderToString (header), value);
-		}
-
-		public void Add (HttpResponseHeader header, string value)
-		{
-			Add (ResponseHeaderToString (header), value);
-		}
-
-		public void Remove (HttpResponseHeader header)
-		{
-			Remove (ResponseHeaderToString (header));
-		}
-
-		public void Set (HttpResponseHeader header, string value)
-		{
-			Set (ResponseHeaderToString (header), value);
-		}
-
-		string RequestHeaderToString (HttpRequestHeader value)
+		static string RequestHeaderToString (HttpRequestHeader value)
 		{
 			switch (value){
 			case HttpRequestHeader.CacheControl:
@@ -515,20 +340,8 @@ namespace WebSocketSharp.Net {
 				throw new InvalidOperationException ();
 			}
 		}
-		
-		
-		public string this[HttpRequestHeader hrh]
-		{
-			get {
-				return Get (RequestHeaderToString (hrh));
-			}
-			
-			set {
-				Add (RequestHeaderToString (hrh), value);
-			}
-		}
 
-		string ResponseHeaderToString (HttpResponseHeader value)
+		static string ResponseHeaderToString (HttpResponseHeader value)
 		{
 			switch (value){
 			case HttpResponseHeader.CacheControl:
@@ -596,135 +409,601 @@ namespace WebSocketSharp.Net {
 			}
 		}
 
-		public string this[HttpResponseHeader hrh]
+		static string Trim (string value)
 		{
-			get
-			{
-				return Get (ResponseHeaderToString (hrh));
+			return value.IsNullOrEmpty ()
+			       ? String.Empty
+			       : value.Trim ();
+		}
+
+		#endregion
+
+		#region Internal Methods
+
+		internal static bool IsHeaderName (string name)
+		{
+			return name.IsNullOrEmpty ()
+			       ? false
+			       : name.IsToken ();
+		}
+
+		internal static bool IsHeaderValue (string value)
+		{
+			return value.IsText ();
+		}
+
+		internal static bool IsMultiValue (string headerName)
+		{
+			return headerName.IsNullOrEmpty ()
+			       ? false
+			       : multiValue.ContainsKey (headerName);
+		}
+
+		internal string ToStringMultiValue ()
+		{
+			var sb = new StringBuilder();
+			int count = base.Count;
+			for (int i = 0; i < count ; i++) {
+				string key = GetKey (i);
+				if (IsMultiValue (key)) {
+					foreach (string v in GetValues (i)) {
+						sb.Append (key)
+						  .Append (": ")
+						  .Append (v)
+						  .Append ("\r\n");
+					}
+				} else {
+					sb.Append (key)
+					  .Append (": ")
+					  .Append (Get (i))
+					  .Append ("\r\n");
+				}
 			}
 
-			set
-			{
-				Add (ResponseHeaderToString (hrh), value);
-			}
+			return sb.Append("\r\n").ToString();
 		}
 
-		public override void Clear ()
-		{
-			base.Clear ();
-		}
-
-		public override IEnumerator GetEnumerator ()
-		{
-			return(base.GetEnumerator ());
-		}
-
-		// Internal Methods
-		
 		// With this we don't check for invalid characters in header. See bug #55994.
 		internal void SetInternal (string header)
 		{
 			int pos = header.IndexOf (':');
 			if (pos == -1)
-				throw new ArgumentException ("no colon found", "header");				
+				throw new ArgumentException ("No colon found", "header");
 
 			SetInternal (header.Substring (0, pos), header.Substring (pos + 1));
 		}
 
-		internal void SetInternal (string name, string value)
-		{
-			if (value == null)
-				value = String.Empty;
-			else
-				value = value.Trim ();
-			if (!IsHeaderValue (value))
-				throw new ArgumentException ("invalid header value");
-
-			if (IsMultiValue (name)) {
-				base.Add (name, value);
-			} else {
-				base.Remove (name);
-				base.Set (name, value);	
-			}
-		}
-
 		internal void RemoveAndAdd (string name, string value)
 		{
-			if (value == null)
-				value = String.Empty;
-			else
-				value = value.Trim ();
-
+			value = Trim (value);
 			base.Remove (name);
 			base.Set (name, value);
 		}
 
 		internal void RemoveInternal (string name)
 		{
-			if (name == null)
+			if (name.IsNull ())
 				throw new ArgumentNullException ("name");
+
 			base.Remove (name);
-		}		
-		
-		// Private Methods
-		
-		internal static bool IsMultiValue (string headerName)
-		{
-			if (headerName == null || headerName == "")
-				return false;
-
-			return multiValue.ContainsKey (headerName);
-		}		
-		
-		internal static bool IsHeaderValue (string value)
-		{
-			// TEXT any 8 bit value except CTL's (0-31 and 127)
-			//      but including \r\n space and \t
-			//      after a newline at least one space or \t must follow
-			//      certain header fields allow comments ()
-				
-			int len = value.Length;
-			for (int i = 0; i < len; i++) {			
-				char c = value [i];
-				if (c == 127)
-					return false;
-				if (c < 0x20 && (c != '\r' && c != '\n' && c != '\t'))
-					return false;
-				if (c == '\n' && ++i < len) {
-					c = value [i];
-					if (c != ' ' && c != '\t')
-						return false;
-				}
-			}
-			
-			return true;
-		}
-		
-		internal static bool IsHeaderName (string name)
-		{
-			if (name == null || name.Length == 0)
-				return false;
-
-			int len = name.Length;
-			for (int i = 0; i < len; i++) {			
-				char c = name [i];
-				if (c > 126 || !allowed_chars [(int) c])
-					return false;
-			}
-			
-			return true;
 		}
 
-		static bool [] allowed_chars = new bool [126] {
-			false, false, false, false, false, false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, false, false, false, false, false, false, false, false, false,
-			false, false, false, false, false, true, false, true, true, true, true, false, false, false, true,
-			true, false, true, true, false, true, true, true, true, true, true, true, true, true, true, false,
-			false, false, false, false, false, false, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
-			false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true,
-			true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true,
-			false, true, false
-			};
+		internal void SetInternal (string name, string value)
+		{
+			value = Trim (value);
+			if (!IsHeaderValue (value))
+				throw new ArgumentException ("Invalid header value.");
+
+			if (IsMultiValue (name)) {
+				base.Add (name, value);
+			} else {
+				base.Remove (name);
+				base.Set (name, value);
+			}
+		}
+
+		#endregion
+
+		#region Explicit Interface Implementation
+
+		/// <summary>
+		/// Populates the specified <see cref="SerializationInfo"/> with the data needed to serialize the <see cref="WebHeaderCollection"/>.
+		/// </summary>
+		/// <param name="serializationInfo">
+		/// A <see cref="SerializationInfo"/> that holds the serialized object data.
+		/// </param>
+		/// <param name="streamingContext">
+		/// A <see cref="StreamingContext"/> that specifies the destination for the serialization.
+		/// </param>
+		[SecurityPermission (SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter, SerializationFormatter = true)]
+		void ISerializable.GetObjectData (
+			SerializationInfo serializationInfo, StreamingContext streamingContext)
+		{
+			GetObjectData (serializationInfo, streamingContext);
+		}
+
+		#endregion
+
+		#region Protected Methods
+
+		/// <summary>
+		/// Adds a header to the collection without checking whether the header is on the restricted header list.
+		/// </summary>
+		/// <param name="headerName">
+		/// A <see cref="string"/> that contains the name of the header to add.
+		/// </param>
+		/// <param name="headerValue">
+		/// A <see cref="string"/> that contains the value of the header to add.
+		/// </param>
+		/// <exception cref="ArgumentException">
+		///   <para>
+		///   <paramref name="headerName"/> is <see langword="null"/>, <see cref="String.Empty"/>, or
+		///   contains invalid characters.
+		///   </para>
+		///   <para>
+		///   -or-
+		///   </para>
+		///   <para>
+		///   <paramref name="headerValue"/> contains invalid characters.
+		///   </para>
+		/// </exception>
+		protected void AddWithoutValidate (string headerName, string headerValue)
+		{
+			var name = Trim (headerName);
+			if (!IsHeaderName (name))
+				throw new ArgumentException ("Invalid header name: " + name, "headerName");
+
+			var value = Trim (headerValue);
+			if (!IsHeaderValue (value))
+				throw new ArgumentException ("Invalid header value: " + value, "headerValue");
+
+			base.Add (name, value);
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Adds the specified <paramref name="header"/> to the collection.
+		/// </summary>
+		/// <param name="header">
+		/// A <see cref="string"/> that contains a header with the name and value separated by a colon (:).
+		/// </param>
+		/// <exception cref="ArgumentNullException">
+		/// <paramref name="header"/> is <see langword="null"/> or a <see cref="String.Empty"/>.
+		/// </exception>
+		/// <exception cref="ArgumentException">
+		/// <paramref name="header"/> does not contain a colon.
+		/// </exception>
+		public void Add (string header)
+		{
+			if (header.IsNullOrEmpty ())
+				throw new ArgumentNullException ("header");
+
+			int pos = header.IndexOf (':');
+			if (pos == -1)
+				throw new ArgumentException ("No colon found", "header");
+
+			Add (header.Substring (0, pos), header.Substring (pos + 1));
+		}
+
+		/// <summary>
+		/// Adds the specified request <paramref name="header"/> with the specified <paramref name="value"/> to the collection.
+		/// </summary>
+		/// <param name="header">
+		/// A <see cref="HttpRequestHeader"/> that contains the name of the request header to add.
+		/// </param>
+		/// <param name="value">
+		/// A <see cref="string"/> that contains the value of the header to add.
+		/// </param>
+		public void Add (HttpRequestHeader header, string value)
+		{
+			Add (RequestHeaderToString (header), value);
+		}
+
+		/// <summary>
+		/// Adds the specified response <paramref name="header"/> with the specified <paramref name="value"/> to the collection.
+		/// </summary>
+		/// <param name="header">
+		/// A <see cref="HttpResponseHeader"/> that contains the name of the response header to add.
+		/// </param>
+		/// <param name="value">
+		/// A <see cref="string"/> that contains the value of the header to add.
+		/// </param>
+		public void Add (HttpResponseHeader header, string value)
+		{
+			Add (ResponseHeaderToString (header), value);
+		}
+
+		/// <summary>
+		/// Adds a header with the specified <paramref name="name"/> and <paramref name="value"/> to the collection.
+		/// </summary>
+		/// <param name="name">
+		/// A <see cref="string"/> that contains the name of the header to add.
+		/// </param>
+		/// <param name="value">
+		/// A <see cref="string"/> that contains the value of the header to add.
+		/// </param>
+		/// <exception cref="ArgumentException">
+		///   <para>
+		///   <paramref name="name"/> is <see langword="null"/> or a <see cref="String.Empty"/>.
+		///   </para>
+		///   <para>
+		///   -or-
+		///   </para>
+		///   <para>
+		///   <paramref name="name"/> is a restricted header that must be set with a property setting.
+		///   </para>
+		///   <para>
+		///   -or-
+		///   </para>
+		/// </exception>
+		/// <exception cref="ArgumentOutOfRangeException">
+		/// The length of <paramref name="value"/> is greater than 65535.
+		/// </exception>
+		public override void Add (string name, string value)
+		{
+			if (internallyCreated && IsRestricted (name))
+				throw new ArgumentException ("This header must be modified with the appropiate property.");
+
+			if (value.Length > 65535)
+				throw new ArgumentOutOfRangeException ("value", "The length must not be greater than 65535.");
+
+			AddWithoutValidate (name, value);
+		}
+
+		/// <summary>
+		/// Removes all headers from the collection.
+		/// </summary>
+		public override void Clear ()
+		{
+			base.Clear ();
+		}
+
+		/// <summary>
+		/// Get the value of the header with the specified <paramref name="index"/> in the collection.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="string"/> that receives the value of the header.
+		/// </returns>
+		/// <param name="index">
+		/// An <see cref="int"/> that is the zero-based index of the header to get.
+		/// </param>
+		public override string Get (int index)
+		{
+			return base.Get (index);
+		}
+
+		/// <summary>
+		/// Get the value of the header with the specified <paramref name="name"/> in the collection.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="string"/> that receives the value of the header.
+		/// <see langword="null"/> if there is no header with <paramref name="name"/> in the collection.
+		/// </returns>
+		/// <param name="name">
+		/// A <see cref="string"/> that contains the name of the header to get.
+		/// </param>
+		public override string Get (string name)
+		{
+			return base.Get (name);
+		}
+
+		/// <summary>
+		/// Gets the enumerator to use to iterate through the <see cref="WebHeaderCollection"/>.
+		/// </summary>
+		/// <returns>
+		/// An instance of an implementation of the <see cref="IEnumerator"/> interface
+		/// to use to iterate through the <see cref="WebHeaderCollection"/>.
+		/// </returns>
+		public override IEnumerator GetEnumerator ()
+		{
+			return base.GetEnumerator ();
+		}
+
+		/// <summary>
+		/// Get the header name at the specified <paramref name="index"/> position in the collection.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="string"/> that receives the header name.
+		/// </returns>
+		/// <param name="index">
+		/// An <see cref="int"/> is the zero-based index of the key to get from the collection.
+		/// </param>
+		public override string GetKey (int index)
+		{
+			return base.GetKey (index);
+		}
+
+		/// <summary>
+		/// Gets an array of header values stored in the specified <paramref name="header"/> name.
+		/// </summary>
+		/// <returns>
+		/// An array of <see cref="string"/> that receives the header values.
+		/// </returns>
+		/// <param name="header">
+		/// A <see cref="string"/> that contains a header name.
+		/// </param>
+		public override string [] GetValues (string header)
+		{
+			string [] values = base.GetValues (header);
+			return values.IsNull () || values.Length == 0
+			       ? null
+			       : values;
+		}
+
+		/// <summary>
+		/// Gets an array of header values stored in the specified <paramref name="index"/> position of the header collection.
+		/// </summary>
+		/// <returns>
+		/// An array of <see cref="string"/> that receives the header values.
+		/// </returns>
+		/// <param name="index">
+		/// An <see cref="int"/> is the zero-based index of the header in the collection.
+		/// </param>
+		public override string [] GetValues (int index)
+		{
+			string [] values = base.GetValues (index);
+			return values.IsNull () || values.Length == 0
+			       ? null
+			       : values;
+		}
+
+		/// <summary>
+		/// Populates the specified <see cref="SerializationInfo"/> with the data needed to serialize the <see cref="WebHeaderCollection"/>.
+		/// </summary>
+		/// <param name="serializationInfo">
+		/// A <see cref="SerializationInfo"/> that holds the serialized object data.
+		/// </param>
+		/// <param name="streamingContext">
+		/// A <see cref="StreamingContext"/> that specifies the destination for the serialization.
+		/// </param>
+		[SecurityPermission (SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)]
+		public override void GetObjectData (
+			SerializationInfo serializationInfo, StreamingContext streamingContext)
+		{
+			int count = base.Count;
+			serializationInfo.AddValue ("Count", count);
+			for (int i = 0; i < count; i++) {
+				serializationInfo.AddValue (i.ToString (), GetKey (i));
+				serializationInfo.AddValue ((count + i).ToString (), Get (i));
+			}
+		}
+
+		/// <summary>
+		/// Determines whether the specified header can be set for the request.
+		/// </summary>
+		/// <returns>
+		/// <c>true</c> if the header is restricted; otherwise, <c>false</c>.
+		/// </returns>
+		/// <param name="headerName">
+		/// A <see cref="string"/> that contains the name of the header to test.
+		/// </param>
+		/// <exception cref="ArgumentNullException">
+		/// <paramref name="headerName"/> is <see langword="null"/> or <see cref="String.Empty"/>.
+		/// </exception>
+		/// <exception cref="ArgumentException">
+		/// <paramref name="headerName"/> contains invalid characters.
+		/// </exception>
+		public static bool IsRestricted (string headerName)
+		{
+			return IsRestricted (headerName, false);
+		}
+
+		/// <summary>
+		/// Determines whether the specified header can be set for the request or the response.
+		/// </summary>
+		/// <returns>
+		/// <c>true</c> if the header is restricted; otherwise, <c>false</c>.
+		/// </returns>
+		/// <param name="headerName">
+		/// A <see cref="string"/> that contains the name of the header to test.
+		/// </param>
+		/// <param name="response">
+		/// <c>true</c> if does the test for the response; for the request, <c>false</c>.
+		/// </param>
+		/// <exception cref="ArgumentNullException">
+		/// <paramref name="headerName"/> is <see langword="null"/> or <see cref="String.Empty"/>.
+		/// </exception>
+		/// <exception cref="ArgumentException">
+		/// <paramref name="headerName"/> contains invalid characters.
+		/// </exception>
+		public static bool IsRestricted (string headerName, bool response)
+		{
+			if (headerName.IsNullOrEmpty ())
+				throw new ArgumentNullException ("headerName", "Must not be null or empty.");
+
+			var name = headerName.Trim ();
+			if (!IsHeaderName (name))
+				throw new ArgumentException ("Invalid character in header.");
+
+			return response
+			       ? restricted_response.ContainsKey (name)
+			       : restricted.ContainsKey (name);
+		}
+
+		/// <summary>
+		/// Implements the <see cref="ISerializable"/> interface and raises the deserialization event
+		/// when the deserialization is complete.
+		/// </summary>
+		/// <param name="sender">
+		/// An <see cref="object"/> that contains the source of the deserialization event.
+		/// </param>
+		public override void OnDeserialization (object sender)
+		{
+		}
+
+		/// <summary>
+		/// Removes the specified header from the collection.
+		/// </summary>
+		/// <param name="header">
+		/// A <see cref="HttpRequestHeader"/> to remove from the collection.
+		/// </param>
+		public void Remove (HttpRequestHeader header)
+		{
+			// TODO: Support to throw InvalidOperationException.
+
+			Remove (RequestHeaderToString (header));
+		}
+
+		/// <summary>
+		/// Removes the specified header from the collection.
+		/// </summary>
+		/// <param name="header">
+		/// A <see cref="HttpResponseHeader"/> to remove from the collection.
+		/// </param>
+		public void Remove (HttpResponseHeader header)
+		{
+			// TODO: Support to throw InvalidOperationException.
+
+			Remove (ResponseHeaderToString (header));
+		}
+
+		/// <summary>
+		/// Removes the specified header from the collection.
+		/// </summary>
+		/// <param name="name">
+		/// A <see cref="string"/> that contains the name of the header to remove from the collection.
+		/// </param>
+		/// <exception cref="ArgumentNullException">
+		/// <paramref name="name"/> is <see langword="null"/> or <see cref="String.Empty"/>.
+		/// </exception>
+		/// <exception cref="ArgumentException">
+		///   <para>
+		///   <paramref name="name"/> contains invalid characters.
+		///   </para>
+		///   <para>
+		///   -or-
+		///   </para>
+		///   <para>
+		///   <paramref name="name"/> is a restricted header name.
+		///   </para>
+		/// </exception>
+		public override void Remove (string name)
+		{
+			if (name.IsNullOrEmpty ())
+				throw new ArgumentNullException ("name");
+
+			name = name.Trim ();
+			if (!IsHeaderName (name))
+				throw new ArgumentException ("Invalid characters in header.");
+
+			if (internallyCreated && IsRestricted (name))
+				throw new ArgumentException ("Restricted header.");
+
+			base.Remove (name);
+		}
+
+		/// <summary>
+		/// Sets the specified header to the specified value.
+		/// </summary>
+		/// <param name="header">
+		/// A <see cref="HttpRequestHeader"/> to set.
+		/// </param>
+		/// <param name="value">
+		/// A <see cref="string"/> that contains the value of the header to set.
+		/// </param>
+		public void Set (HttpRequestHeader header, string value)
+		{
+			// TODO: Support to throw InvalidOperationException.
+
+			Set (RequestHeaderToString (header), value);
+		}
+
+		/// <summary>
+		/// Sets the specified header to the specified value.
+		/// </summary>
+		/// <param name="header">
+		/// A <see cref="HttpResponseHeader"/> to set.
+		/// </param>
+		/// <param name="value">
+		/// A <see cref="string"/> that contains the value of the header to set.
+		/// </param>
+		public void Set (HttpResponseHeader header, string value)
+		{
+			// TODO: Support to throw InvalidOperationException.
+
+			Set (ResponseHeaderToString (header), value);
+		}
+
+		/// <summary>
+		/// Sets the specified header to the specified value.
+		/// </summary>
+		/// <param name="name">
+		/// A <see cref="string"/> that contains the name of the header to set.
+		/// </param>
+		/// <param name="value">
+		/// A <see cref="string"/> that contains the value of the header to set.
+		/// </param>
+		/// <exception cref="ArgumentNullException">
+		/// <paramref name="name"/> is <see langword="null"/> or <see cref="String.Empty"/>.
+		/// </exception>
+		/// <exception cref="ArgumentException">
+		///   <para>
+		///   <paramref name="name"/> or <paramref name="value"/> contain invalid characters.
+		///   </para>
+		///   <para>
+		///   -or-
+		///   </para>
+		///   <para>
+		///   <paramref name="name"/> is a restricted header name.
+		///   </para>
+		/// </exception>
+		/// <exception cref="ArgumentOutOfRangeException">
+		/// The length of <paramref name="value"/> is greater than 65535.
+		/// </exception>
+		public override void Set (string name, string value)
+		{
+			if (name.IsNullOrEmpty ())
+				throw new ArgumentNullException ("name");
+
+			name = name.Trim ();
+			if (!IsHeaderName (name))
+				throw new ArgumentException ("Invalid header name.");
+
+			if (internallyCreated && IsRestricted (name))
+				throw new ArgumentException ("Restricted header.");
+
+			value = Trim (value);
+			if (value.Length > 65535)
+				throw new ArgumentOutOfRangeException ("value", "The length must not be greater than 65535.");
+
+			if (!IsHeaderValue (value))
+				throw new ArgumentException ("Invalid header value.");
+
+			base.Set (name, value);
+		}
+
+		/// <summary>
+		/// Converts the current <see cref="WebHeaderCollection"/> to an array of <see cref="byte"/>.
+		/// </summary>
+		/// <returns>
+		/// An array of <see cref="byte"/> that receives the converted current <see cref="WebHeaderCollection"/>.
+		/// </returns>
+		public byte [] ToByteArray ()
+		{
+			return Encoding.UTF8.GetBytes (ToString ());
+		}
+
+		/// <summary>
+		/// Returns a <see cref="string"/> that represents the current <see cref="WebHeaderCollection"/>.
+		/// </summary>
+		/// <returns>
+		/// A <see cref="string"/> that represents the current <see cref="WebHeaderCollection"/>.
+		/// </returns>
+		public override string ToString ()
+		{
+			var sb = new StringBuilder();
+			for (int i = 0; i < Count ; i++)
+				sb.Append (GetKey (i))
+				  .Append (": ")
+				  .Append (Get (i))
+				  .Append ("\r\n");
+
+			return sb.Append("\r\n").ToString();
+		}
+
+		#endregion
 	}
 }
diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
index 6c916f76..f624d82a 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 2fb66402..63eb8ac7 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 8de72964..ef94d7e5 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 3a9770d8..597eb293 100644
--- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
+++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
@@ -2954,6 +2954,403 @@
             <param name="s">The string to encode.</param>
             <param name="output">The TextWriter output stream containing the encoded string.</param>
         </member>
+        <member name="T:WebSocketSharp.Net.WebHeaderCollection">
+            <summary>
+            Provides a collection of the HTTP headers associated with a request or response.
+            </summary>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" /> class
+            with the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> and <see cref="T:System.Runtime.Serialization.StreamingContext" />.
+            </summary>
+            <param name="serializationInfo">
+            A <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data.
+            </param>
+            <param name="streamingContext">
+            A <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains the contextual information about the source or destination.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" /> class.
+            </summary>
+        </member>
+        <member name="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpRequestHeader)">
+            <summary>
+            Gets or sets the specified request <paramref name="header" /> in the collection.
+            </summary>
+            <value>
+            A <see cref="T:System.String" /> that contains the value of the specified request <paramref name="header" />.
+            </value>
+            <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> that contains a request header name.
+            </param>
+        </member>
+        <member name="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpResponseHeader)">
+            <summary>
+            Gets or sets the specified response <paramref name="header" /> in the collection.
+            </summary>
+            <value>
+            A <see cref="T:System.String" /> that contains the value of the specified response <paramref name="header" />.
+            </value>
+            <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> that contains a response header name.
+            </param>
+        </member>
+        <member name="P:WebSocketSharp.Net.WebHeaderCollection.AllKeys">
+            <summary>
+            Gets all header names in the collection.
+            </summary>
+            <value>
+            An array of <see cref="T:System.String" /> that contains all header names in the collection.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Net.WebHeaderCollection.Count">
+            <summary>
+            Gets the number of headers in the collection.
+            </summary>
+            <value>
+            An <see cref="T:System.Int32" /> that indicates the number of headers in the collection.
+            </value>
+        </member>
+        <member name="P:WebSocketSharp.Net.WebHeaderCollection.Keys">
+            <summary>
+            Gets a collection of header names in the collection.
+            </summary>
+            <value>
+            A <see cref="T:System.Collections.Specialized.NameObjectCollectionBase.KeysCollection" /> that contains a collection of header names in the collection.
+            </value>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.System#Runtime#Serialization#ISerializable#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with the data needed to serialize the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
+            <param name="serializationInfo">
+            A <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data.
+            </param>
+            <param name="streamingContext">
+            A <see cref="T:System.Runtime.Serialization.StreamingContext" /> that specifies the destination for the serialization.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.AddWithoutValidate(System.String,System.String)">
+            <summary>
+            Adds a header to the collection without checking whether the header is on the restricted header list.
+            </summary>
+            <param name="headerName">
+            A <see cref="T:System.String" /> that contains the name of the header to add.
+            </param>
+            <param name="headerValue">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+            <exception cref="T:System.ArgumentException">
+                <para>
+                    <paramref name="headerName" /> is <see langword="null" />, <see cref="F:System.String.Empty" />, or
+            contains invalid characters.
+            </para>
+                <para>
+            -or-
+            </para>
+                <para>
+                    <paramref name="headerValue" /> contains invalid characters.
+            </para>
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String)">
+            <summary>
+            Adds the specified <paramref name="header" /> to the collection.
+            </summary>
+            <param name="header">
+            A <see cref="T:System.String" /> that contains a header with the name and value separated by a colon (:).
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+                <paramref name="header" /> is <see langword="null" /> or a <see cref="F:System.String.Empty" />.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+                <paramref name="header" /> does not contain a colon.
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpRequestHeader,System.String)">
+            <summary>
+            Adds the specified request <paramref name="header" /> with the specified <paramref name="value" /> to the collection.
+            </summary>
+            <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> that contains the name of the request header to add.
+            </param>
+            <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpResponseHeader,System.String)">
+            <summary>
+            Adds the specified response <paramref name="header" /> with the specified <paramref name="value" /> to the collection.
+            </summary>
+            <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> that contains the name of the response header to add.
+            </param>
+            <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String,System.String)">
+            <summary>
+            Adds a header with the specified <paramref name="name" /> and <paramref name="value" /> to the collection.
+            </summary>
+            <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to add.
+            </param>
+            <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+            <exception cref="T:System.ArgumentException">
+                <para>
+                    <paramref name="name" /> is <see langword="null" /> or a <see cref="F:System.String.Empty" />.
+            </para>
+                <para>
+            -or-
+            </para>
+                <para>
+                    <paramref name="name" /> is a restricted header that must be set with a property setting.
+            </para>
+                <para>
+            -or-
+            </para>
+            </exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            The length of <paramref name="value" /> is greater than 65535.
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Clear">
+            <summary>
+            Removes all headers from the collection.
+            </summary>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.Int32)">
+            <summary>
+            Get the value of the header with the specified <paramref name="index" /> in the collection.
+            </summary>
+            <returns>
+            A <see cref="T:System.String" /> that receives the value of the header.
+            </returns>
+            <param name="index">
+            An <see cref="T:System.Int32" /> that is the zero-based index of the header to get.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.String)">
+            <summary>
+            Get the value of the header with the specified <paramref name="name" /> in the collection.
+            </summary>
+            <returns>
+            A <see cref="T:System.String" /> that receives the value of the header.
+            <see langword="null" /> if there is no header with <paramref name="name" /> in the collection.
+            </returns>
+            <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to get.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.GetEnumerator">
+            <summary>
+            Gets the enumerator to use to iterate through the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
+            <returns>
+            An instance of an implementation of the <see cref="T:System.Collections.IEnumerator" /> interface
+            to use to iterate through the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </returns>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.GetKey(System.Int32)">
+            <summary>
+            Get the header name at the specified <paramref name="index" /> position in the collection.
+            </summary>
+            <returns>
+            A <see cref="T:System.String" /> that receives the header name.
+            </returns>
+            <param name="index">
+            An <see cref="T:System.Int32" /> is the zero-based index of the key to get from the collection.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.String)">
+            <summary>
+            Gets an array of header values stored in the specified <paramref name="header" /> name.
+            </summary>
+            <returns>
+            An array of <see cref="T:System.String" /> that receives the header values.
+            </returns>
+            <param name="header">
+            A <see cref="T:System.String" /> that contains a header name.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.Int32)">
+            <summary>
+            Gets an array of header values stored in the specified <paramref name="index" /> position of the header collection.
+            </summary>
+            <returns>
+            An array of <see cref="T:System.String" /> that receives the header values.
+            </returns>
+            <param name="index">
+            An <see cref="T:System.Int32" /> is the zero-based index of the header in the collection.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Populates the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with the data needed to serialize the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
+            <param name="serializationInfo">
+            A <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data.
+            </param>
+            <param name="streamingContext">
+            A <see cref="T:System.Runtime.Serialization.StreamingContext" /> that specifies the destination for the serialization.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String)">
+            <summary>
+            Determines whether the specified header can be set for the request.
+            </summary>
+            <returns>
+                <c>true</c> if the header is restricted; otherwise, <c>false</c>.
+            </returns>
+            <param name="headerName">
+            A <see cref="T:System.String" /> that contains the name of the header to test.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+                <paramref name="headerName" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+                <paramref name="headerName" /> contains invalid characters.
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String,System.Boolean)">
+            <summary>
+            Determines whether the specified header can be set for the request or the response.
+            </summary>
+            <returns>
+                <c>true</c> if the header is restricted; otherwise, <c>false</c>.
+            </returns>
+            <param name="headerName">
+            A <see cref="T:System.String" /> that contains the name of the header to test.
+            </param>
+            <param name="response">
+                <c>true</c> if does the test for the response; for the request, <c>false</c>.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+                <paramref name="headerName" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+                <paramref name="headerName" /> contains invalid characters.
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.OnDeserialization(System.Object)">
+            <summary>
+            Implements the <see cref="T:System.Runtime.Serialization.ISerializable" /> interface and raises the deserialization event
+            when the deserialization is complete.
+            </summary>
+            <param name="sender">
+            An <see cref="T:System.Object" /> that contains the source of the deserialization event.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpRequestHeader)">
+            <summary>
+            Removes the specified header from the collection.
+            </summary>
+            <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> to remove from the collection.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpResponseHeader)">
+            <summary>
+            Removes the specified header from the collection.
+            </summary>
+            <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> to remove from the collection.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.String)">
+            <summary>
+            Removes the specified header from the collection.
+            </summary>
+            <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to remove from the collection.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+                <paramref name="name" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+                <para>
+                    <paramref name="name" /> contains invalid characters.
+            </para>
+                <para>
+            -or-
+            </para>
+                <para>
+                    <paramref name="name" /> is a restricted header name.
+            </para>
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpRequestHeader,System.String)">
+            <summary>
+            Sets the specified header to the specified value.
+            </summary>
+            <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> to set.
+            </param>
+            <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to set.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpResponseHeader,System.String)">
+            <summary>
+            Sets the specified header to the specified value.
+            </summary>
+            <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> to set.
+            </param>
+            <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to set.
+            </param>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.String,System.String)">
+            <summary>
+            Sets the specified header to the specified value.
+            </summary>
+            <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to set.
+            </param>
+            <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to set.
+            </param>
+            <exception cref="T:System.ArgumentNullException">
+                <paramref name="name" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+            <exception cref="T:System.ArgumentException">
+                <para>
+                    <paramref name="name" /> or <paramref name="value" /> contain invalid characters.
+            </para>
+                <para>
+            -or-
+            </para>
+                <para>
+                    <paramref name="name" /> is a restricted header name.
+            </para>
+            </exception>
+            <exception cref="T:System.ArgumentOutOfRangeException">
+            The length of <paramref name="value" /> is greater than 65535.
+            </exception>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.ToByteArray">
+            <summary>
+            Converts the current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" /> to an array of <see cref="T:System.Byte" />.
+            </summary>
+            <returns>
+            An array of <see cref="T:System.Byte" /> that receives the converted current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </returns>
+        </member>
+        <member name="M:WebSocketSharp.Net.WebHeaderCollection.ToString">
+            <summary>
+            Returns a <see cref="T:System.String" /> that represents the current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
+            <returns>
+            A <see cref="T:System.String" /> that represents the current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </returns>
+        </member>
         <member name="T:WebSocketSharp.Server.HttpServer">
             <summary>
             Provides a simple HTTP server that allows to accept the WebSocket connection requests.
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net/WebHeaderCollection.html b/websocket-sharp/doc/html/WebSocketSharp.Net/WebHeaderCollection.html
index e772ff62..636299f6 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Net/WebHeaderCollection.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Net/WebHeaderCollection.html
@@ -207,8 +207,8 @@
     </div>
     <h1 class="PageTitle" id="T:WebSocketSharp.Net.WebHeaderCollection">WebHeaderCollection  Class</h1>
     <p class="Summary" id="T:WebSocketSharp.Net.WebHeaderCollection:Summary">
-      <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-    </p>
+            Provides a collection of the HTTP headers associated with a request or response.
+            </p>
     <div id="T:WebSocketSharp.Net.WebHeaderCollection:Signature">
       <h2>Syntax</h2>
       <div class="Signature">[System.Runtime.InteropServices.ComVisible(true)]<br />public class  <b>WebHeaderCollection</b> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Specialized.NameValueCollection">System.Collections.Specialized.NameValueCollection</a>,	<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.ISerializable">System.Runtime.Serialization.ISerializable</a></div>
@@ -243,8 +243,8 @@
                     </b>()</div>
                 </td>
                 <td>
-                  <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-                </td>
+            Initializes a new instance of the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a> class.
+            </td>
               </tr>
             </table>
           </div>
@@ -265,8 +265,9 @@
                     </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a>)</div>
                 </td>
                 <td>
-                  <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-                </td>
+            Initializes a new instance of the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a> class
+            with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> and <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a>.
+            </td>
               </tr>
             </table>
           </div>
@@ -284,7 +285,9 @@
                 </td>
                 <td>
                   <i>
-                    <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[]</i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                    <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[]</i>. 
+            Gets all header names in the collection.
+            </td>
               </tr>
               <tr valign="top">
                 <td>[read-only]<div>override </div></td>
@@ -296,7 +299,9 @@
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets the number of headers in the collection.
+            </td>
               </tr>
               <tr valign="top">
                 <td>
@@ -313,7 +318,9 @@
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets or sets the specified request <i>header</i> in the collection.
+            </td>
               </tr>
               <tr valign="top">
                 <td>
@@ -330,7 +337,9 @@
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets or sets the specified response <i>header</i> in the collection.
+            </td>
               </tr>
               <tr valign="top">
                 <td>[read-only]<div>override </div></td>
@@ -342,7 +351,9 @@
                 <td>
                   <i>
                     <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Specialized.NameObjectCollectionBase.KeysCollection">System.Collections.Specialized.NameObjectCollectionBase.KeysCollection</a>
-                  </i>. <span class="NotEntered">Documentation for this section has not yet been entered.</span></td>
+                  </i>. 
+            Gets a collection of header names in the collection.
+            </td>
               </tr>
             </table>
           </div>
@@ -359,7 +370,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String)">Add</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Adds the specified <i>header</i> to the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -369,7 +382,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpRequestHeader,System.String)">Add</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Adds the specified request <i>header</i> with the specified <i>value</i> to the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -379,7 +394,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpResponseHeader,System.String)">Add</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Adds the specified response <i>header</i> with the specified <i>value</i> to the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -388,7 +405,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String,System.String)">Add</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Adds a header with the specified <i>name</i> and <i>value</i> to the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -397,7 +416,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Clear">Clear</a>
-                  </b>()<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>()<blockquote>
+            Removes all headers from the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -406,7 +427,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Get(System.Int32)">Get</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote>
+            Get the value of the header with the specified <i>index</i> in the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -415,7 +438,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Get(System.String)">Get</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.String">string</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote>
+            Get the value of the header with the specified <i>name</i> in the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -424,7 +449,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.GetEnumerator">GetEnumerator</a>
-                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.IEnumerator">IEnumerator</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.IEnumerator">IEnumerator</a></nobr><blockquote>
+            Gets the enumerator to use to iterate through the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -433,7 +460,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.GetKey(System.Int32)">GetKey</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote>
+            Get the header name at the specified <i>index</i> position in the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -442,7 +471,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">GetObjectData</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a>)<blockquote>
+            Populates the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> with the data needed to serialize the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -451,7 +482,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.Int32)">GetValues</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[]</nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[]</nobr><blockquote>
+            Gets an array of header values stored in the specified <i>index</i> position of the header collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -460,7 +493,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.String)">GetValues</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.String">string</a>[]</nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[]</nobr><blockquote>
+            Gets an array of header values stored in the specified <i>header</i> name.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -469,7 +504,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String)">IsRestricted</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </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>
+            Determines whether the specified header can be set for the request.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -478,7 +515,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String,System.Boolean)">IsRestricted</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.Boolean">bool</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </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.Boolean">bool</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
+            Determines whether the specified header can be set for the request or the response.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -487,7 +526,10 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.OnDeserialization(System.Object)">OnDeserialization</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a>)<blockquote>
+            Implements the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.ISerializable">System.Runtime.Serialization.ISerializable</a> interface and raises the deserialization event
+            when the deserialization is complete.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -497,7 +539,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpRequestHeader)">Remove</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a>)<blockquote>
+            Removes the specified header from the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -507,7 +551,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpResponseHeader)">Remove</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a>)<blockquote>
+            Removes the specified header from the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -516,7 +562,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.String)">Remove</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Removes the specified header from the collection.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -526,7 +574,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpRequestHeader,System.String)">Set</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Sets the specified header to the specified value.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -536,7 +586,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpResponseHeader,System.String)">Set</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Sets the specified header to the specified value.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -545,7 +597,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.Set(System.String,System.String)">Set</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Sets the specified header to the specified value.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -555,7 +609,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.ToByteArray">ToByteArray</a>
-                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[]</nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[]</nobr><blockquote>
+            Converts the current <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a> to an array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>.
+            </blockquote></td>
               </tr>
               <tr valign="top">
                 <td>
@@ -564,7 +620,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.ToString">ToString</a>
-                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>()<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote>
+            Returns a <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that represents the current <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </blockquote></td>
               </tr>
             </table>
           </div>
@@ -581,7 +639,9 @@
                 <td colspan="2">
                   <b>
                     <a href="#M:WebSocketSharp.Net.WebHeaderCollection.AddWithoutValidate(System.String,System.String)">AddWithoutValidate</a>
-                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote><span class="NotEntered">Documentation for this section has not yet been entered.</span></blockquote></td>
+                  </b>(<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<blockquote>
+            Adds a header to the collection without checking whether the header is on the restricted header list.
+            </blockquote></td>
               </tr>
             </table>
           </div>
@@ -601,8 +661,8 @@
                   </a>
                 </td>
                 <td>
-                  <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-                </td>
+            Populates the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> with the data needed to serialize the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </td>
               </tr>
             </table>
           </div>
@@ -667,8 +727,8 @@
         <h3 id="C:WebSocketSharp.Net.WebHeaderCollection">WebHeaderCollection Constructor</h3>
         <blockquote id="C:WebSocketSharp.Net.WebHeaderCollection:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Initializes a new instance of the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a> class.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public  <b>WebHeaderCollection</b> ()</div>
           <h2 class="Section">Remarks</h2>
@@ -683,8 +743,9 @@
         <h3 id="C:WebSocketSharp.Net.WebHeaderCollection(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">WebHeaderCollection Constructor</h3>
         <blockquote id="C:WebSocketSharp.Net.WebHeaderCollection(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Initializes a new instance of the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a> class
+            with the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> and <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">protected  <b>WebHeaderCollection</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> serializationInfo, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a> streamingContext)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -694,14 +755,14 @@
                 <i>serializationInfo</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> that holds the serialized object data.
+            </dd>
               <dt>
                 <i>streamingContext</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a> that contains the contextual information about the source or destination.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -716,8 +777,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String)">Add Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Adds the specified <i>header</i> to the collection.
+            </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>Add</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> header)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -727,10 +788,35 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a header with the name and value separated by a colon (:).
+            </dd>
             </dl>
           </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentNullException">ArgumentNullException</a>
+                </td>
+                <td>
+                  <i>header</i> is <tt>null</tt> or a <a href="http://www.go-mono.com/docs/monodoc.ashx?link=F:System.String.Empty">string.Empty</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <i>header</i> does not contain a colon.
+            </td>
+              </tr>
+            </table>
+          </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -743,8 +829,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpRequestHeader,System.String)">Add Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpRequestHeader,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Adds the specified request <i>header</i> with the specified <i>value</i> to the collection.
+            </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>Add</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> header, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -754,14 +840,14 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> that contains the name of the request header to add.
+            </dd>
               <dt>
                 <i>value</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the header to add.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -776,8 +862,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpResponseHeader,System.String)">Add Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.Net.HttpResponseHeader,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Adds the specified response <i>header</i> with the specified <i>value</i> to the collection.
+            </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>Add</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> header, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -787,14 +873,14 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> that contains the name of the response header to add.
+            </dd>
               <dt>
                 <i>value</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the header to add.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -809,8 +895,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String,System.String)">Add Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Adds a header with the specified <i>name</i> and <i>value</i> to the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Add</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> name, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -820,16 +906,52 @@
                 <i>name</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the name of the header to add.
+            </dd>
               <dt>
                 <i>value</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the header to add.
+            </dd>
             </dl>
           </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String,System.String):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <p>
+                    <i>name</i> is <tt>null</tt> or a <a href="http://www.go-mono.com/docs/monodoc.ashx?link=F:System.String.Empty">string.Empty</a>.
+            </p>
+                  <p>
+            -or-
+            </p>
+                  <p>
+                    <i>name</i> is a restricted header that must be set with a property setting.
+            </p>
+                  <p>
+            -or-
+            </p>
+                </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentOutOfRangeException">ArgumentOutOfRangeException</a>
+                </td>
+                <td>
+            The length of <i>value</i> is greater than 65535.
+            </td>
+              </tr>
+            </table>
+          </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Add(System.String,System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -842,8 +964,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.AddWithoutValidate(System.String,System.String)">AddWithoutValidate Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.AddWithoutValidate(System.String,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Adds a header to the collection without checking whether the header is on the restricted header list.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">protected <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>AddWithoutValidate</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> headerName, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> headerValue)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -853,16 +975,42 @@
                 <i>headerName</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the name of the header to add.
+            </dd>
               <dt>
                 <i>headerValue</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the header to add.
+            </dd>
             </dl>
           </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.AddWithoutValidate(System.String,System.String):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <p>
+                    <i>headerName</i> is <tt>null</tt>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=F:System.String.Empty">string.Empty</a>, or
+            contains invalid characters.
+            </p>
+                  <p>
+            -or-
+            </p>
+                  <p>
+                    <i>headerValue</i> contains invalid characters.
+            </p>
+                </td>
+              </tr>
+            </table>
+          </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.AddWithoutValidate(System.String,System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -875,14 +1023,14 @@
         <h3 id="P:WebSocketSharp.Net.WebHeaderCollection.AllKeys">AllKeys Property</h3>
         <blockquote id="P:WebSocketSharp.Net.WebHeaderCollection.AllKeys:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets all header names in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[] <b>AllKeys</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.AllKeys:Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains all header names in the collection.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.AllKeys:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -895,8 +1043,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Clear">Clear Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Clear:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Removes all headers from the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Clear</b> ()</div>
           <h2 class="Section">Remarks</h2>
@@ -911,14 +1059,14 @@
         <h3 id="P:WebSocketSharp.Net.WebHeaderCollection.Count">Count Property</h3>
         <blockquote id="P:WebSocketSharp.Net.WebHeaderCollection.Count:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets the number of headers in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <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.Net.WebHeaderCollection.Count:Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> that indicates the number of headers in the collection.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Count:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -931,8 +1079,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.Int32)">Get Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.Int32):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Get the value of the header with the specified <i>index</i> in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>Get</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> index)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -942,14 +1090,14 @@
                 <i>index</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> that is the zero-based index of the header to get.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.Int32):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that receives the value of the header.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.Int32):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -962,8 +1110,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.String)">Get Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Get the value of the header with the specified <i>name</i> in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>Get</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> name)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -973,14 +1121,15 @@
                 <i>name</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the name of the header to get.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that receives the value of the header.
+            <tt>null</tt> if there is no header with <i>name</i> in the collection.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Get(System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -993,14 +1142,15 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.GetEnumerator">GetEnumerator Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.GetEnumerator:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets the enumerator to use to iterate through the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.IEnumerator">IEnumerator</a> <b>GetEnumerator</b> ()</div>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetEnumerator:Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            An instance of an implementation of the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.IEnumerator">IEnumerator</a> interface
+            to use to iterate through the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetEnumerator:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1013,8 +1163,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.GetKey(System.Int32)">GetKey Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.GetKey(System.Int32):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Get the header name at the specified <i>index</i> position in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>GetKey</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> index)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1024,14 +1174,14 @@
                 <i>index</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> is the zero-based index of the key to get from the collection.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetKey(System.Int32):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that receives the header name.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetKey(System.Int32):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1044,8 +1194,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">GetObjectData Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Populates the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> with the data needed to serialize the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>GetObjectData</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> serializationInfo, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a> streamingContext)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1055,14 +1205,14 @@
                 <i>serializationInfo</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> that holds the serialized object data.
+            </dd>
               <dt>
                 <i>streamingContext</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a> that specifies the destination for the serialization.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1077,8 +1227,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.Int32)">GetValues Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.Int32):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets an array of header values stored in the specified <i>index</i> position of the header collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[] <b>GetValues</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> index)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1088,14 +1238,14 @@
                 <i>index</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Int32">int</a> is the zero-based index of the header in the collection.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.Int32):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that receives the header values.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.Int32):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1108,8 +1258,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.String)">GetValues Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets an array of header values stored in the specified <i>header</i> name.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>[] <b>GetValues</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> header)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1119,14 +1269,14 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a header name.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that receives the header values.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.GetValues(System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1139,8 +1289,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String)">IsRestricted Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Determines whether the specified header can be set for the request.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public static <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>IsRestricted</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> headerName)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1150,13 +1300,38 @@
                 <i>headerName</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the name of the header to test.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+            <tt>true</tt> if the header is restricted; otherwise, <tt>false</tt>.
+            </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentNullException">ArgumentNullException</a>
+                </td>
+                <td>
+                  <i>headerName</i> is <tt>null</tt> or <a href="http://www.go-mono.com/docs/monodoc.ashx?link=F:System.String.Empty">string.Empty</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <i>headerName</i> contains invalid characters.
+            </td>
+              </tr>
+            </table>
           </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String):Remarks">
@@ -1170,8 +1345,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String,System.Boolean)">IsRestricted Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String,System.Boolean):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Determines whether the specified header can be set for the request or the response.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public static <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>IsRestricted</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> headerName, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> response)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1181,19 +1356,44 @@
                 <i>headerName</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the name of the header to test.
+            </dd>
               <dt>
                 <i>response</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+                <tt>true</tt> if does the test for the response; for the request, <tt>false</tt>.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String,System.Boolean):Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
+            <tt>true</tt> if the header is restricted; otherwise, <tt>false</tt>.
+            </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String,System.Boolean):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentNullException">ArgumentNullException</a>
+                </td>
+                <td>
+                  <i>headerName</i> is <tt>null</tt> or <a href="http://www.go-mono.com/docs/monodoc.ashx?link=F:System.String.Empty">string.Empty</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <i>headerName</i> contains invalid characters.
+            </td>
+              </tr>
+            </table>
           </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.IsRestricted(System.String,System.Boolean):Remarks">
@@ -1207,28 +1407,28 @@
         <h3 id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpRequestHeader)">Item Property</h3>
         <blockquote id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpRequestHeader):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets or sets the specified request <i>header</i> in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">
             <p>
               <i>This is the default property for this class.</i>
-            </p>public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> this [<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> hrh] { get; set; }</div>
+            </p>public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> this [<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> header] { get; set; }</div>
           <h4 class="Subsection">Parameters</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpRequestHeader):Parameters">
             <dl>
               <dt>
-                <i>hrh</i>
+                <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> that contains a request header name.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpRequestHeader):Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the specified request <i>header</i>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpRequestHeader):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1241,28 +1441,28 @@
         <h3 id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpResponseHeader)">Item Property</h3>
         <blockquote id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpResponseHeader):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets or sets the specified response <i>header</i> in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">
             <p>
               <i>This is the default property for this class.</i>
-            </p>public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> this [<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> hrh] { get; set; }</div>
+            </p>public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> this [<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> header] { get; set; }</div>
           <h4 class="Subsection">Parameters</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpResponseHeader):Parameters">
             <dl>
               <dt>
-                <i>hrh</i>
+                <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> that contains a response header name.
+            </dd>
             </dl>
           </blockquote>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpResponseHeader):Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the specified response <i>header</i>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Item(System.Net.HttpResponseHeader):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1275,14 +1475,14 @@
         <h3 id="P:WebSocketSharp.Net.WebHeaderCollection.Keys">Keys Property</h3>
         <blockquote id="P:WebSocketSharp.Net.WebHeaderCollection.Keys:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Gets a collection of header names in the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Specialized.NameObjectCollectionBase.KeysCollection">System.Collections.Specialized.NameObjectCollectionBase.KeysCollection</a> <b>Keys</b>  { get; }</div>
           <h4 class="Subsection">Value</h4>
           <blockquote class="SubsectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Keys:Value">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Collections.Specialized.NameObjectCollectionBase.KeysCollection">System.Collections.Specialized.NameObjectCollectionBase.KeysCollection</a> that contains a collection of header names in the collection.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="P:WebSocketSharp.Net.WebHeaderCollection.Keys:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1295,8 +1495,9 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.OnDeserialization(System.Object)">OnDeserialization Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.OnDeserialization(System.Object):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Implements the <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.ISerializable">System.Runtime.Serialization.ISerializable</a> interface and raises the deserialization event
+            when the deserialization is complete.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>OnDeserialization</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a> sender)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1306,8 +1507,8 @@
                 <i>sender</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Object">object</a> that contains the source of the deserialization event.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1322,8 +1523,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpRequestHeader)">Remove Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpRequestHeader):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Removes the specified header from the collection.
+            </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>Remove</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> header)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1333,8 +1534,8 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> to remove from the collection.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1349,8 +1550,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpResponseHeader)">Remove Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.Net.HttpResponseHeader):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Removes the specified header from the collection.
+            </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>Remove</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> header)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1360,8 +1561,8 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> to remove from the collection.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1376,8 +1577,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.String)">Remove Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Removes the specified header from the collection.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Remove</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> name)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1387,10 +1588,43 @@
                 <i>name</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the name of the header to remove from the collection.
+            </dd>
             </dl>
           </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.String):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentNullException">ArgumentNullException</a>
+                </td>
+                <td>
+                  <i>name</i> is <tt>null</tt> or <a href="http://www.go-mono.com/docs/monodoc.ashx?link=F:System.String.Empty">string.Empty</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <p>
+                    <i>name</i> contains invalid characters.
+            </p>
+                  <p>
+            -or-
+            </p>
+                  <p>
+                    <i>name</i> is a restricted header name.
+            </p>
+                </td>
+              </tr>
+            </table>
+          </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Remove(System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1403,8 +1637,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpRequestHeader,System.String)">Set Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpRequestHeader,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Sets the specified header to the specified value.
+            </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>Set</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> header, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1414,14 +1648,14 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpRequestHeader">System.Net.HttpRequestHeader</a> to set.
+            </dd>
               <dt>
                 <i>value</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the header to set.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1436,8 +1670,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpResponseHeader,System.String)">Set Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.Net.HttpResponseHeader,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Sets the specified header to the specified value.
+            </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>Set</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> header, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1447,14 +1681,14 @@
                 <i>header</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.HttpResponseHeader">System.Net.HttpResponseHeader</a> to set.
+            </dd>
               <dt>
                 <i>value</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the header to set.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1469,8 +1703,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.String,System.String)">Set Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.String,System.String):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Sets the specified header to the specified value.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>Set</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> name, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value)</div>
           <h4 class="Subsection">Parameters</h4>
@@ -1480,16 +1714,57 @@
                 <i>name</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the name of the header to set.
+            </dd>
               <dt>
                 <i>value</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains the value of the header to set.
+            </dd>
             </dl>
           </blockquote>
+          <h4 class="Subsection">Exceptions</h4>
+          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.String,System.String):Exceptions">
+            <table class="TypeDocumentation">
+              <tr>
+                <th>Type</th>
+                <th>Reason</th>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentNullException">ArgumentNullException</a>
+                </td>
+                <td>
+                  <i>name</i> is <tt>null</tt> or <a href="http://www.go-mono.com/docs/monodoc.ashx?link=F:System.String.Empty">string.Empty</a>.
+            </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentException">ArgumentException</a>
+                </td>
+                <td>
+                  <p>
+                    <i>name</i> or <i>value</i> contain invalid characters.
+            </p>
+                  <p>
+            -or-
+            </p>
+                  <p>
+                    <i>name</i> is a restricted header name.
+            </p>
+                </td>
+              </tr>
+              <tr valign="top">
+                <td>
+                  <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.ArgumentOutOfRangeException">ArgumentOutOfRangeException</a>
+                </td>
+                <td>
+            The length of <i>value</i> is greater than 65535.
+            </td>
+              </tr>
+            </table>
+          </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.Set(System.String,System.String):Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1502,8 +1777,8 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.System#Runtime#Serialization#ISerializable#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">System.Runtime.Serialization.ISerializable.GetObjectData Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.System#Runtime#Serialization#ISerializable#GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext):member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Populates the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> with the data needed to serialize the <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">
             <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Void">void</a> <b>System.Runtime.Serialization.ISerializable.GetObjectData</b> (<a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> serializationInfo, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a> streamingContext)</div>
@@ -1514,14 +1789,14 @@
                 <i>serializationInfo</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.SerializationInfo">System.Runtime.Serialization.SerializationInfo</a> that holds the serialized object data.
+            </dd>
               <dt>
                 <i>streamingContext</i>
               </dt>
               <dd>
-                <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-              </dd>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Runtime.Serialization.StreamingContext">System.Runtime.Serialization.StreamingContext</a> that specifies the destination for the serialization.
+            </dd>
             </dl>
           </blockquote>
           <h2 class="Section">Remarks</h2>
@@ -1536,14 +1811,14 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.ToByteArray">ToByteArray Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.ToByteArray:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Converts the current <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a> to an array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a>[] <b>ToByteArray</b> ()</div>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.ToByteArray:Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            An array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Byte">byte</a> that receives the converted current <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.ToByteArray:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
@@ -1556,14 +1831,14 @@
         <h3 id="M:WebSocketSharp.Net.WebHeaderCollection.ToString">ToString Method</h3>
         <blockquote id="M:WebSocketSharp.Net.WebHeaderCollection.ToString:member">
           <p class="Summary">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </p>
+            Returns a <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that represents the current <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </p>
           <h2>Syntax</h2>
           <div class="Signature">public override <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>ToString</b> ()</div>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.ToString:Returns">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </blockquote>
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that represents the current <a href="../WebSocketSharp.Net/WebHeaderCollection.html">WebSocketSharp.Net.WebHeaderCollection</a>.
+            </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Net.WebHeaderCollection.ToString:Remarks">
             <span class="NotEntered">Documentation for this section has not yet been entered.</span>
diff --git a/websocket-sharp/doc/html/WebSocketSharp.Net/index.html b/websocket-sharp/doc/html/WebSocketSharp.Net/index.html
index 9575703a..65c03d8e 100644
--- a/websocket-sharp/doc/html/WebSocketSharp.Net/index.html
+++ b/websocket-sharp/doc/html/WebSocketSharp.Net/index.html
@@ -311,8 +311,8 @@
             <a href="./WebHeaderCollection.html">WebHeaderCollection</a>
           </td>
           <td>
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </td>
+            Provides a collection of the HTTP headers associated with a request or response.
+            </td>
         </tr>
       </table>
     </div>
diff --git a/websocket-sharp/doc/html/index.html b/websocket-sharp/doc/html/index.html
index 000d2b33..b19790e9 100644
--- a/websocket-sharp/doc/html/index.html
+++ b/websocket-sharp/doc/html/index.html
@@ -403,8 +403,8 @@
             <a href="WebSocketSharp.Net/WebHeaderCollection.html">WebHeaderCollection</a>
           </td>
           <td>
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </td>
+            Provides a collection of the HTTP headers associated with a request or response.
+            </td>
         </tr>
       </table>
       <h2 class="Section">
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp.Net/WebHeaderCollection.xml b/websocket-sharp/doc/mdoc/WebSocketSharp.Net/WebHeaderCollection.xml
index 93fe4b2a..f1c79fca 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp.Net/WebHeaderCollection.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp.Net/WebHeaderCollection.xml
@@ -18,7 +18,9 @@
     </Attribute>
   </Attributes>
   <Docs>
-    <summary>To be added.</summary>
+    <summary>
+            Provides a collection of the HTTP headers associated with a request or response.
+            </summary>
     <remarks>To be added.</remarks>
   </Docs>
   <Members>
@@ -28,7 +30,9 @@
       <MemberType>Constructor</MemberType>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
+        <summary>
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" /> class.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -41,9 +45,16 @@
         <Parameter Name="streamingContext" Type="System.Runtime.Serialization.StreamingContext" />
       </Parameters>
       <Docs>
-        <param name="serializationInfo">To be added.</param>
-        <param name="streamingContext">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="serializationInfo">
+            A <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data.
+            </param>
+        <param name="streamingContext">
+            A <see cref="T:System.Runtime.Serialization.StreamingContext" /> that contains the contextual information about the source or destination.
+            </param>
+        <summary>
+            Initializes a new instance of the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" /> class
+            with the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> and <see cref="T:System.Runtime.Serialization.StreamingContext" />.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -58,9 +69,19 @@
         <Parameter Name="header" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="header">
+            A <see cref="T:System.String" /> that contains a header with the name and value separated by a colon (:).
+            </param>
+        <summary>
+            Adds the specified <paramref name="header" /> to the collection.
+            </summary>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">
+          <paramref name="header" /> is <see langword="null" /> or a <see cref="F:System.String.Empty" />.
+            </exception>
+        <exception cref="T:System.ArgumentException">
+          <paramref name="header" /> does not contain a colon.
+            </exception>
       </Docs>
     </Member>
     <Member MemberName="Add">
@@ -75,9 +96,15 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> that contains the name of the request header to add.
+            </param>
+        <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+        <summary>
+            Adds the specified request <paramref name="header" /> with the specified <paramref name="value" /> to the collection.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -93,9 +120,15 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> that contains the name of the response header to add.
+            </param>
+        <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+        <summary>
+            Adds the specified response <paramref name="header" /> with the specified <paramref name="value" /> to the collection.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -111,10 +144,33 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to add.
+            </param>
+        <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+        <summary>
+            Adds a header with the specified <paramref name="name" /> and <paramref name="value" /> to the collection.
+            </summary>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentException">
+          <para>
+            <paramref name="name" /> is <see langword="null" /> or a <see cref="F:System.String.Empty" />.
+            </para>
+          <para>
+            -or-
+            </para>
+          <para>
+            <paramref name="name" /> is a restricted header that must be set with a property setting.
+            </para>
+          <para>
+            -or-
+            </para>
+        </exception>
+        <exception cref="T:System.ArgumentOutOfRangeException">
+            The length of <paramref name="value" /> is greater than 65535.
+            </exception>
       </Docs>
     </Member>
     <Member MemberName="AddWithoutValidate">
@@ -129,10 +185,28 @@
         <Parameter Name="headerValue" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="headerName">To be added.</param>
-        <param name="headerValue">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="headerName">
+            A <see cref="T:System.String" /> that contains the name of the header to add.
+            </param>
+        <param name="headerValue">
+            A <see cref="T:System.String" /> that contains the value of the header to add.
+            </param>
+        <summary>
+            Adds a header to the collection without checking whether the header is on the restricted header list.
+            </summary>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentException">
+          <para>
+            <paramref name="headerName" /> is <see langword="null" />, <see cref="F:System.String.Empty" />, or
+            contains invalid characters.
+            </para>
+          <para>
+            -or-
+            </para>
+          <para>
+            <paramref name="headerValue" /> contains invalid characters.
+            </para>
+        </exception>
       </Docs>
     </Member>
     <Member MemberName="AllKeys">
@@ -143,8 +217,12 @@
         <ReturnType>System.String[]</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <summary>
+            Gets all header names in the collection.
+            </summary>
+        <value>
+            An array of <see cref="T:System.String" /> that contains all header names in the collection.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -157,7 +235,9 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
+        <summary>
+            Removes all headers from the collection.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -169,8 +249,12 @@
         <ReturnType>System.Int32</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <summary>
+            Gets the number of headers in the collection.
+            </summary>
+        <value>
+            An <see cref="T:System.Int32" /> that indicates the number of headers in the collection.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -185,9 +269,15 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="index">
+            An <see cref="T:System.Int32" /> that is the zero-based index of the header to get.
+            </param>
+        <summary>
+            Get the value of the header with the specified <paramref name="index" /> in the collection.
+            </summary>
+        <returns>
+            A <see cref="T:System.String" /> that receives the value of the header.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -202,9 +292,16 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to get.
+            </param>
+        <summary>
+            Get the value of the header with the specified <paramref name="name" /> in the collection.
+            </summary>
+        <returns>
+            A <see cref="T:System.String" /> that receives the value of the header.
+            <see langword="null" /> if there is no header with <paramref name="name" /> in the collection.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -217,8 +314,13 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <summary>
+            Gets the enumerator to use to iterate through the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
+        <returns>
+            An instance of an implementation of the <see cref="T:System.Collections.IEnumerator" /> interface
+            to use to iterate through the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -233,9 +335,15 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="index">
+            An <see cref="T:System.Int32" /> is the zero-based index of the key to get from the collection.
+            </param>
+        <summary>
+            Get the header name at the specified <paramref name="index" /> position in the collection.
+            </summary>
+        <returns>
+            A <see cref="T:System.String" /> that receives the header name.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -251,9 +359,15 @@
         <Parameter Name="streamingContext" Type="System.Runtime.Serialization.StreamingContext" />
       </Parameters>
       <Docs>
-        <param name="serializationInfo">To be added.</param>
-        <param name="streamingContext">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="serializationInfo">
+            A <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data.
+            </param>
+        <param name="streamingContext">
+            A <see cref="T:System.Runtime.Serialization.StreamingContext" /> that specifies the destination for the serialization.
+            </param>
+        <summary>
+            Populates the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with the data needed to serialize the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -268,9 +382,15 @@
         <Parameter Name="index" Type="System.Int32" />
       </Parameters>
       <Docs>
-        <param name="index">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="index">
+            An <see cref="T:System.Int32" /> is the zero-based index of the header in the collection.
+            </param>
+        <summary>
+            Gets an array of header values stored in the specified <paramref name="index" /> position of the header collection.
+            </summary>
+        <returns>
+            An array of <see cref="T:System.String" /> that receives the header values.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -285,9 +405,15 @@
         <Parameter Name="header" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="header">
+            A <see cref="T:System.String" /> that contains a header name.
+            </param>
+        <summary>
+            Gets an array of header values stored in the specified <paramref name="header" /> name.
+            </summary>
+        <returns>
+            An array of <see cref="T:System.String" /> that receives the header values.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -302,10 +428,22 @@
         <Parameter Name="headerName" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="headerName">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="headerName">
+            A <see cref="T:System.String" /> that contains the name of the header to test.
+            </param>
+        <summary>
+            Determines whether the specified header can be set for the request.
+            </summary>
+        <returns>
+          <c>true</c> if the header is restricted; otherwise, <c>false</c>.
+            </returns>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">
+          <paramref name="headerName" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+        <exception cref="T:System.ArgumentException">
+          <paramref name="headerName" /> contains invalid characters.
+            </exception>
       </Docs>
     </Member>
     <Member MemberName="IsRestricted">
@@ -320,44 +458,70 @@
         <Parameter Name="response" Type="System.Boolean" />
       </Parameters>
       <Docs>
-        <param name="headerName">To be added.</param>
-        <param name="response">To be added.</param>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <param name="headerName">
+            A <see cref="T:System.String" /> that contains the name of the header to test.
+            </param>
+        <param name="response">
+          <c>true</c> if does the test for the response; for the request, <c>false</c>.
+            </param>
+        <summary>
+            Determines whether the specified header can be set for the request or the response.
+            </summary>
+        <returns>
+          <c>true</c> if the header is restricted; otherwise, <c>false</c>.
+            </returns>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">
+          <paramref name="headerName" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+        <exception cref="T:System.ArgumentException">
+          <paramref name="headerName" /> contains invalid characters.
+            </exception>
       </Docs>
     </Member>
     <Member MemberName="Item">
-      <MemberSignature Language="C#" Value="public string this[System.Net.HttpRequestHeader hrh] { get; set; }" />
+      <MemberSignature Language="C#" Value="public string this[System.Net.HttpRequestHeader header] { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance string Item(valuetype System.Net.HttpRequestHeader)" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="hrh" Type="System.Net.HttpRequestHeader" />
+        <Parameter Name="header" Type="System.Net.HttpRequestHeader" />
       </Parameters>
       <Docs>
-        <param name="hrh">To be added.</param>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> that contains a request header name.
+            </param>
+        <summary>
+            Gets or sets the specified request <paramref name="header" /> in the collection.
+            </summary>
+        <value>
+            A <see cref="T:System.String" /> that contains the value of the specified request <paramref name="header" />.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="Item">
-      <MemberSignature Language="C#" Value="public string this[System.Net.HttpResponseHeader hrh] { get; set; }" />
+      <MemberSignature Language="C#" Value="public string this[System.Net.HttpResponseHeader header] { get; set; }" />
       <MemberSignature Language="ILAsm" Value=".property instance string Item(valuetype System.Net.HttpResponseHeader)" />
       <MemberType>Property</MemberType>
       <ReturnValue>
         <ReturnType>System.String</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="hrh" Type="System.Net.HttpResponseHeader" />
+        <Parameter Name="header" Type="System.Net.HttpResponseHeader" />
       </Parameters>
       <Docs>
-        <param name="hrh">To be added.</param>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> that contains a response header name.
+            </param>
+        <summary>
+            Gets or sets the specified response <paramref name="header" /> in the collection.
+            </summary>
+        <value>
+            A <see cref="T:System.String" /> that contains the value of the specified response <paramref name="header" />.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -369,8 +533,12 @@
         <ReturnType>System.Collections.Specialized.NameObjectCollectionBase+KeysCollection</ReturnType>
       </ReturnValue>
       <Docs>
-        <summary>To be added.</summary>
-        <value>To be added.</value>
+        <summary>
+            Gets a collection of header names in the collection.
+            </summary>
+        <value>
+            A <see cref="T:System.Collections.Specialized.NameObjectCollectionBase.KeysCollection" /> that contains a collection of header names in the collection.
+            </value>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -385,8 +553,13 @@
         <Parameter Name="sender" Type="System.Object" />
       </Parameters>
       <Docs>
-        <param name="sender">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="sender">
+            An <see cref="T:System.Object" /> that contains the source of the deserialization event.
+            </param>
+        <summary>
+            Implements the <see cref="T:System.Runtime.Serialization.ISerializable" /> interface and raises the deserialization event
+            when the deserialization is complete.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -401,8 +574,12 @@
         <Parameter Name="header" Type="System.Net.HttpRequestHeader" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> to remove from the collection.
+            </param>
+        <summary>
+            Removes the specified header from the collection.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -417,8 +594,12 @@
         <Parameter Name="header" Type="System.Net.HttpResponseHeader" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> to remove from the collection.
+            </param>
+        <summary>
+            Removes the specified header from the collection.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -433,9 +614,27 @@
         <Parameter Name="name" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to remove from the collection.
+            </param>
+        <summary>
+            Removes the specified header from the collection.
+            </summary>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">
+          <paramref name="name" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+        <exception cref="T:System.ArgumentException">
+          <para>
+            <paramref name="name" /> contains invalid characters.
+            </para>
+          <para>
+            -or-
+            </para>
+          <para>
+            <paramref name="name" /> is a restricted header name.
+            </para>
+        </exception>
       </Docs>
     </Member>
     <Member MemberName="Set">
@@ -450,9 +649,15 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="header">
+            A <see cref="T:System.Net.HttpRequestHeader" /> to set.
+            </param>
+        <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to set.
+            </param>
+        <summary>
+            Sets the specified header to the specified value.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -468,9 +673,15 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="header">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="header">
+            A <see cref="T:System.Net.HttpResponseHeader" /> to set.
+            </param>
+        <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to set.
+            </param>
+        <summary>
+            Sets the specified header to the specified value.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -486,10 +697,33 @@
         <Parameter Name="value" Type="System.String" />
       </Parameters>
       <Docs>
-        <param name="name">To be added.</param>
-        <param name="value">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="name">
+            A <see cref="T:System.String" /> that contains the name of the header to set.
+            </param>
+        <param name="value">
+            A <see cref="T:System.String" /> that contains the value of the header to set.
+            </param>
+        <summary>
+            Sets the specified header to the specified value.
+            </summary>
         <remarks>To be added.</remarks>
+        <exception cref="T:System.ArgumentNullException">
+          <paramref name="name" /> is <see langword="null" /> or <see cref="F:System.String.Empty" />.
+            </exception>
+        <exception cref="T:System.ArgumentException">
+          <para>
+            <paramref name="name" /> or <paramref name="value" /> contain invalid characters.
+            </para>
+          <para>
+            -or-
+            </para>
+          <para>
+            <paramref name="name" /> is a restricted header name.
+            </para>
+        </exception>
+        <exception cref="T:System.ArgumentOutOfRangeException">
+            The length of <paramref name="value" /> is greater than 65535.
+            </exception>
       </Docs>
     </Member>
     <Member MemberName="System.Runtime.Serialization.ISerializable.GetObjectData">
@@ -504,9 +738,15 @@
         <Parameter Name="streamingContext" Type="System.Runtime.Serialization.StreamingContext" />
       </Parameters>
       <Docs>
-        <param name="serializationInfo">To be added.</param>
-        <param name="streamingContext">To be added.</param>
-        <summary>To be added.</summary>
+        <param name="serializationInfo">
+            A <see cref="T:System.Runtime.Serialization.SerializationInfo" /> that holds the serialized object data.
+            </param>
+        <param name="streamingContext">
+            A <see cref="T:System.Runtime.Serialization.StreamingContext" /> that specifies the destination for the serialization.
+            </param>
+        <summary>
+            Populates the specified <see cref="T:System.Runtime.Serialization.SerializationInfo" /> with the data needed to serialize the <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -519,8 +759,12 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <summary>
+            Converts the current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" /> to an array of <see cref="T:System.Byte" />.
+            </summary>
+        <returns>
+            An array of <see cref="T:System.Byte" /> that receives the converted current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
@@ -533,8 +777,12 @@
       </ReturnValue>
       <Parameters />
       <Docs>
-        <summary>To be added.</summary>
-        <returns>To be added.</returns>
+        <summary>
+            Returns a <see cref="T:System.String" /> that represents the current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </summary>
+        <returns>
+            A <see cref="T:System.String" /> that represents the current <see cref="T:WebSocketSharp.Net.WebHeaderCollection" />.
+            </returns>
         <remarks>To be added.</remarks>
       </Docs>
     </Member>
diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml
index c44513c3..e1c2c511 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.30644">
+    <Assembly Name="websocket-sharp" Version="1.0.2.28338">
       <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>
diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb
index 7f7d2aab..48ac9369 100644
Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ