diff --git a/Example/bin/Debug/example.exe b/Example/bin/Debug/example.exe
index e8756918..d34f8f9d 100755
Binary files a/Example/bin/Debug/example.exe and b/Example/bin/Debug/example.exe differ
diff --git a/Example/bin/Debug/websocket-sharp.dll b/Example/bin/Debug/websocket-sharp.dll
index f2c3f003..dfa3bc61 100755
Binary files a/Example/bin/Debug/websocket-sharp.dll and b/Example/bin/Debug/websocket-sharp.dll differ
diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe
index 836ea181..91c4c081 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/websocket-sharp.dll b/Example/bin/Debug_Ubuntu/websocket-sharp.dll
index af86fa4b..4b8ecf2c 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/Release/example.exe b/Example/bin/Release/example.exe
index 36a5fb4b..18cbc680 100755
Binary files a/Example/bin/Release/example.exe and b/Example/bin/Release/example.exe differ
diff --git a/Example/bin/Release/websocket-sharp.dll b/Example/bin/Release/websocket-sharp.dll
index 643eb71b..8a2dc0c8 100755
Binary files a/Example/bin/Release/websocket-sharp.dll and b/Example/bin/Release/websocket-sharp.dll differ
diff --git a/Example/bin/Release_Ubuntu/example.exe b/Example/bin/Release_Ubuntu/example.exe
index 26e4d422..93cb1868 100755
Binary files a/Example/bin/Release_Ubuntu/example.exe and b/Example/bin/Release_Ubuntu/example.exe differ
diff --git a/Example/bin/Release_Ubuntu/websocket-sharp.dll b/Example/bin/Release_Ubuntu/websocket-sharp.dll
index 5a3f9686..c318c3a8 100755
Binary files a/Example/bin/Release_Ubuntu/websocket-sharp.dll and b/Example/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/Example1/bin/Debug/example1.exe b/Example1/bin/Debug/example1.exe
index ba7fc6d9..7ca94251 100755
Binary files a/Example1/bin/Debug/example1.exe and b/Example1/bin/Debug/example1.exe differ
diff --git a/Example1/bin/Debug/websocket-sharp.dll b/Example1/bin/Debug/websocket-sharp.dll
index f2c3f003..dfa3bc61 100755
Binary files a/Example1/bin/Debug/websocket-sharp.dll and b/Example1/bin/Debug/websocket-sharp.dll differ
diff --git a/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe
index 5d0f28e2..2a0669bf 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/websocket-sharp.dll b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll
index af86fa4b..4b8ecf2c 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/Release/example1.exe b/Example1/bin/Release/example1.exe
index ed0bd74a..48a3d53e 100755
Binary files a/Example1/bin/Release/example1.exe and b/Example1/bin/Release/example1.exe differ
diff --git a/Example1/bin/Release/websocket-sharp.dll b/Example1/bin/Release/websocket-sharp.dll
index 643eb71b..8a2dc0c8 100755
Binary files a/Example1/bin/Release/websocket-sharp.dll and b/Example1/bin/Release/websocket-sharp.dll differ
diff --git a/Example1/bin/Release_Ubuntu/example1.exe b/Example1/bin/Release_Ubuntu/example1.exe
index 69260fb5..afdd0a03 100755
Binary files a/Example1/bin/Release_Ubuntu/example1.exe and b/Example1/bin/Release_Ubuntu/example1.exe differ
diff --git a/Example1/bin/Release_Ubuntu/websocket-sharp.dll b/Example1/bin/Release_Ubuntu/websocket-sharp.dll
index 5a3f9686..c318c3a8 100755
Binary files a/Example1/bin/Release_Ubuntu/websocket-sharp.dll and b/Example1/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/Example2/bin/Debug/example2.exe b/Example2/bin/Debug/example2.exe
index 3b2bbc8f..666af267 100755
Binary files a/Example2/bin/Debug/example2.exe and b/Example2/bin/Debug/example2.exe differ
diff --git a/Example2/bin/Debug/websocket-sharp.dll b/Example2/bin/Debug/websocket-sharp.dll
index f2c3f003..dfa3bc61 100755
Binary files a/Example2/bin/Debug/websocket-sharp.dll and b/Example2/bin/Debug/websocket-sharp.dll differ
diff --git a/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe
index 04aae284..1a590498 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/websocket-sharp.dll b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll
index af86fa4b..4b8ecf2c 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/Release/example2.exe b/Example2/bin/Release/example2.exe
index c0e8a684..fc123ca5 100755
Binary files a/Example2/bin/Release/example2.exe and b/Example2/bin/Release/example2.exe differ
diff --git a/Example2/bin/Release/websocket-sharp.dll b/Example2/bin/Release/websocket-sharp.dll
index 643eb71b..8a2dc0c8 100755
Binary files a/Example2/bin/Release/websocket-sharp.dll and b/Example2/bin/Release/websocket-sharp.dll differ
diff --git a/Example2/bin/Release_Ubuntu/example2.exe b/Example2/bin/Release_Ubuntu/example2.exe
index 35a8d0c0..66647dbd 100755
Binary files a/Example2/bin/Release_Ubuntu/example2.exe and b/Example2/bin/Release_Ubuntu/example2.exe differ
diff --git a/Example2/bin/Release_Ubuntu/websocket-sharp.dll b/Example2/bin/Release_Ubuntu/websocket-sharp.dll
index 5a3f9686..c318c3a8 100755
Binary files a/Example2/bin/Release_Ubuntu/websocket-sharp.dll and b/Example2/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/Example3/bin/Debug/Example3.exe b/Example3/bin/Debug/Example3.exe
index 28a49480..c60d3eaa 100755
Binary files a/Example3/bin/Debug/Example3.exe and b/Example3/bin/Debug/Example3.exe differ
diff --git a/Example3/bin/Debug/websocket-sharp.dll b/Example3/bin/Debug/websocket-sharp.dll
index f2c3f003..dfa3bc61 100755
Binary files a/Example3/bin/Debug/websocket-sharp.dll and b/Example3/bin/Debug/websocket-sharp.dll differ
diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe
index 7428ea68..56b265e8 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/websocket-sharp.dll b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll
index af86fa4b..4b8ecf2c 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/Release/Example3.exe b/Example3/bin/Release/Example3.exe
index a77649df..26292ee2 100755
Binary files a/Example3/bin/Release/Example3.exe and b/Example3/bin/Release/Example3.exe differ
diff --git a/Example3/bin/Release/websocket-sharp.dll b/Example3/bin/Release/websocket-sharp.dll
index 643eb71b..8a2dc0c8 100755
Binary files a/Example3/bin/Release/websocket-sharp.dll and b/Example3/bin/Release/websocket-sharp.dll differ
diff --git a/Example3/bin/Release_Ubuntu/Example3.exe b/Example3/bin/Release_Ubuntu/Example3.exe
index 40100770..9c56b19e 100755
Binary files a/Example3/bin/Release_Ubuntu/Example3.exe and b/Example3/bin/Release_Ubuntu/Example3.exe differ
diff --git a/Example3/bin/Release_Ubuntu/websocket-sharp.dll b/Example3/bin/Release_Ubuntu/websocket-sharp.dll
index 5a3f9686..c318c3a8 100755
Binary files a/Example3/bin/Release_Ubuntu/websocket-sharp.dll and b/Example3/bin/Release_Ubuntu/websocket-sharp.dll differ
diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs
index 6f8bf77b..2fc0b1a6 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -236,6 +236,52 @@ namespace WebSocketSharp {
              : null;
     }
 
+    // <summary>
+    // Determines whether the specified object is <see langword="null"/>.
+    // </summary>
+    // <returns>
+    // <c>true</c> if <paramref name="obj"/> is <see langword="null"/>; otherwise, <c>false</c>.
+    // </returns>
+    // <param name="obj">
+    // An <b>object</b> to test.
+    // </param>
+    // <typeparam name="T">
+    // The type of <paramref name="obj"/> parameter.
+    // </typeparam>
+    internal static bool IsNull<T>(this T obj)
+      where T : class
+    {
+      return obj == null;
+    }
+
+    // <summary>
+    // Determines whether the specified object is <see langword="null"/>.
+    // And invokes the specified <see cref="Action"/> delegate if the specified object is <see langword="null"/>.
+    // </summary>
+    // <returns>
+    // <c>true</c> if the <paramref name="obj"/> parameter is <see langword="null"/>; otherwise, <c>false</c>.
+    // </returns>
+    // <param name="obj">
+    // A <b>class</b> to test.
+    // </param>
+    // <param name="act">
+    // An <see cref="Action"/> delegate that contains the method(s) called if the <paramref name="obj"/> is <see langword="null"/>.
+    // </param>
+    // <typeparam name="T">
+    // The type of the <paramref name="obj"/> parameter.
+    // </typeparam>
+    internal static bool IsNullDo<T>(this T obj, Action act)
+      where T : class
+    {
+      if (obj == null)
+      {
+        act();
+        return true;
+      }
+
+      return false;
+    }
+
     internal static bool IsText(this string value)
     {
       int len = value.Length;
@@ -374,7 +420,7 @@ namespace WebSocketSharp {
     /// </exception>
     public static TcpListenerWebSocketContext AcceptWebSocket(this TcpListener listener, bool secure)
     {
-      if (listener.IsNull())
+      if (listener == null)
         throw new ArgumentNullException("listener");
 
       var client = listener.AcceptTcpClient();
@@ -398,7 +444,7 @@ namespace WebSocketSharp {
     /// </exception>
     public static void AcceptWebSocketAsync(this TcpListener listener, bool secure, Action<TcpListenerWebSocketContext> completed)
     {
-      if (listener.IsNull())
+      if (listener == null)
         throw new ArgumentNullException("listener");
 
       AsyncCallback callback = (ar) =>
@@ -416,21 +462,21 @@ namespace WebSocketSharp {
     /// in the specified array of <see cref="char"/>.
     /// </summary>
     /// <returns>
-    /// <c>true</c> if <paramref name="str"/> contains any of <paramref name="chars"/>; otherwise, <c>false</c>.
+    /// <c>true</c> if <paramref name="value"/> contains any of <paramref name="chars"/>; otherwise, <c>false</c>.
     /// </returns>
-    /// <param name="str">
+    /// <param name="value">
     /// A <see cref="string"/> to test.
     /// </param>
     /// <param name="chars">
     /// An array of <see cref="char"/> that contains characters to find.
     /// </param>
-    public static bool Contains(this string str, params char[] chars)
+    public static bool Contains(this string value, params char[] chars)
     {
-      return str.IsNullOrEmpty()
-             ? false
-             : chars.Length == 0
-               ? true
-               : str.IndexOfAny(chars) != -1;
+      return chars.Length == 0
+             ? true
+             : value == null || value.Length == 0
+               ? false
+               : value.IndexOfAny(chars) != -1;
     }
 
     /// <summary>
@@ -448,7 +494,7 @@ namespace WebSocketSharp {
     public static void Emit(
       this EventHandler eventHandler, object sender, EventArgs e)
     {
-      if (!eventHandler.IsNull())
+      if (eventHandler != null)
         eventHandler(sender, e);
     }
 
@@ -471,7 +517,7 @@ namespace WebSocketSharp {
       this EventHandler<TEventArgs> eventHandler, object sender, TEventArgs e)
       where TEventArgs : EventArgs
     {
-      if (!eventHandler.IsNull())
+      if (eventHandler != null)
         eventHandler(sender, e);
     }
 
@@ -519,9 +565,9 @@ namespace WebSocketSharp {
     /// </param>
     public static bool Exists(this NameValueCollection collection, string name)
     {
-      return collection.IsNull()
+      return collection == null
              ? false
-             : !collection[name].IsNull();
+             : collection[name] != null;
     }
 
     /// <summary>
@@ -541,11 +587,11 @@ namespace WebSocketSharp {
     /// </param>
     public static bool Exists(this NameValueCollection collection, string name, string value)
     {
-      if (collection.IsNull())
+      if (collection == null)
         return false;
 
       var values = collection[name];
-      if (values.IsNull())
+      if (values == null)
         return false;
 
       foreach (string v in values.Split(','))
@@ -566,7 +612,7 @@ namespace WebSocketSharp {
     /// </param>
     public static string GetAbsolutePath(this Uri uri)
     {
-      if (uri.IsNull())
+      if (uri == null)
         return null;
 
       if (uri.IsAbsoluteUri)
@@ -599,7 +645,7 @@ namespace WebSocketSharp {
     public static CookieCollection GetCookies(this NameValueCollection headers, bool response)
     {
       var name = response ? "Set-Cookie" : "Cookie";
-      if (headers.IsNull() || !headers.Exists(name))
+      if (headers == null || !headers.Exists(name))
         return new CookieCollection();
 
       return CookieCollection.Parse(headers[name], response);
@@ -620,20 +666,22 @@ namespace WebSocketSharp {
     }
 
     /// <summary>
-    /// Gets the name from the specified <see cref="string"/> that contains a pair of name and value are separated by a separator string.
+    /// Gets the name from the specified <see cref="string"/> that contains a pair of name and value
+    /// separated by a separator string.
     /// </summary>
     /// <returns>
     /// A <see cref="string"/> that contains the name if any; otherwise, <c>null</c>.
     /// </returns>
     /// <param name="nameAndValue">
-    /// A <see cref="string"/> that contains a pair of name and value are separated by a separator string.
+    /// A <see cref="string"/> that contains a pair of name and value separated by a separator string.
     /// </param>
     /// <param name="separator">
     /// A <see cref="string"/> that contains a separator string.
     /// </param>
     public static string GetName(this string nameAndValue, string separator)
     {
-      return !nameAndValue.IsNullOrEmpty() && !separator.IsNullOrEmpty()
+      return (nameAndValue != null && nameAndValue.Length != 0) &&
+             (separator != null && separator.Length != 0)
              ? nameAndValue.GetNameInternal(separator)
              : null;
     }
@@ -654,7 +702,7 @@ namespace WebSocketSharp {
     {
       var name  = nameAndValue.GetName(separator);
       var value = nameAndValue.GetValue(separator);
-      return !name.IsNull()
+      return name != null
              ? new KeyValuePair<string, string>(name, value)
              : new KeyValuePair<string, string>(null, null);
     }
@@ -724,20 +772,22 @@ namespace WebSocketSharp {
     }
 
     /// <summary>
-    /// Gets the value from the specified <see cref="string"/> that contains a pair of name and value are separated by a separator string.
+    /// Gets the value from the specified <see cref="string"/> that contains a pair of name and value
+    /// separated by a separator string.
     /// </summary>
     /// <returns>
     /// A <see cref="string"/> that contains the value if any; otherwise, <c>null</c>.
     /// </returns>
     /// <param name="nameAndValue">
-    /// A <see cref="string"/> that contains a pair of name and value are separated by a separator string.
+    /// A <see cref="string"/> that contains a pair of name and value separated by a separator string.
     /// </param>
     /// <param name="separator">
     /// A <see cref="string"/> that contains a separator string.
     /// </param>
     public static string GetValue(this string nameAndValue, string separator)
     {
-      return !nameAndValue.IsNullOrEmpty() && !separator.IsNullOrEmpty()
+      return (nameAndValue != null && nameAndValue.Length != 0) &&
+             (separator != null && separator.Length != 0)
              ? nameAndValue.GetValueInternal(separator)
              : null;
     }
@@ -794,19 +844,19 @@ namespace WebSocketSharp {
     /// Determines whether the specified <see cref="string"/> is enclosed in the specified <see cref="char"/>.
     /// </summary>
     /// <returns>
-    /// <c>true</c> if <paramref name="str"/> is enclosed in <paramref name="c"/>; otherwise, <c>false</c>.
+    /// <c>true</c> if <paramref name="value"/> is enclosed in <paramref name="c"/>; otherwise, <c>false</c>.
     /// </returns>
-    /// <param name="str">
+    /// <param name="value">
     /// A <see cref="string"/> to test.
     /// </param>
     /// <param name="c">
     /// A <see cref="char"/> that contains character to find.
     /// </param>
-    public static bool IsEnclosedIn(this string str, char c)
+    public static bool IsEnclosedIn(this string value, char c)
     {
-      return str.IsNullOrEmpty()
+      return value == null || value.Length == 0
              ? false
-             : str[0] == c && str[str.Length - 1] == c;
+             : value[0] == c && value[value.Length - 1] == c;
     }
 
     /// <summary>
@@ -839,7 +889,7 @@ namespace WebSocketSharp {
     /// </exception>
     public static bool IsLocal(this System.Net.IPAddress address)
     {
-      if (address.IsNull())
+      if (address == null)
         throw new ArgumentNullException("address");
 
       if (System.Net.IPAddress.IsLoopback(address))
@@ -854,52 +904,6 @@ namespace WebSocketSharp {
       return false;
     }
 
-    /// <summary>
-    /// Determines whether the specified object is <see langword="null"/>.
-    /// </summary>
-    /// <returns>
-    /// <c>true</c> if <paramref name="obj"/> is <see langword="null"/>; otherwise, <c>false</c>.
-    /// </returns>
-    /// <param name="obj">
-    /// An <b>object</b> to test.
-    /// </param>
-    /// <typeparam name="T">
-    /// The type of <paramref name="obj"/> parameter.
-    /// </typeparam>
-    public static bool IsNull<T>(this T obj)
-      where T : class
-    {
-      return obj == null;
-    }
-
-    /// <summary>
-    /// Determines whether the specified object is <see langword="null"/>.
-    /// And invokes the specified <see cref="Action"/> delegate if the specified object is <see langword="null"/>.
-    /// </summary>
-    /// <returns>
-    /// <c>true</c> if the <paramref name="obj"/> parameter is <see langword="null"/>; otherwise, <c>false</c>.
-    /// </returns>
-    /// <param name="obj">
-    /// A <b>class</b> to test.
-    /// </param>
-    /// <param name="act">
-    /// An <see cref="Action"/> delegate that contains the method(s) called if the <paramref name="obj"/> is <see langword="null"/>.
-    /// </param>
-    /// <typeparam name="T">
-    /// The type of the <paramref name="obj"/> parameter.
-    /// </typeparam>
-    public static bool IsNullDo<T>(this T obj, Action act)
-      where T : class
-    {
-      if (obj.IsNull())
-      {
-        act();
-        return true;
-      }
-
-      return false;
-    }
-
     /// <summary>
     /// Determines whether the specified <see cref="string"/> is <see langword="null"/> or empty.
     /// </summary>
@@ -911,7 +915,7 @@ namespace WebSocketSharp {
     /// </param>
     public static bool IsNullOrEmpty(this string value)
     {
-      return value.IsNull() || value.IsEmpty();
+      return value == null || value.Length == 0;
     }
 
     /// <summary>
@@ -925,7 +929,7 @@ namespace WebSocketSharp {
     /// </param>
     public static bool IsPredefinedScheme(this string scheme)
     {
-      if (scheme.IsNull() && scheme.Length < 2)
+      if (scheme == null && scheme.Length < 2)
         return false;
 
       char c = scheme[0];
@@ -986,13 +990,13 @@ namespace WebSocketSharp {
     /// </exception>
     public static bool IsUpgradeTo(this HttpListenerRequest request, string protocol)
     {
-      if (request.IsNull())
+      if (request == null)
         throw new ArgumentNullException("request");
 
-      if (protocol.IsNull())
+      if (protocol == null)
         throw new ArgumentNullException("protocol");
 
-      if (protocol.IsEmpty())
+      if (protocol.Length == 0)
         throw new ArgumentException("Must not be empty.", "protocol");
 
       if (!request.Headers.Exists("Upgrade", protocol))
@@ -1018,7 +1022,7 @@ namespace WebSocketSharp {
     /// </param>
     public static bool IsValidAbsolutePath(this string absPath, out string message)
     {
-      if (absPath.IsNullOrEmpty())
+      if (absPath == null || absPath.Length == 0)
       {
         message = "Must not be null or empty.";
         return false;
@@ -1053,7 +1057,7 @@ namespace WebSocketSharp {
     /// </param>
     public static bool MaybeUri(this string uriString)
     {
-      if (uriString.IsNullOrEmpty())
+      if (uriString == null || uriString.Length == 0)
         return false;
 
       int p = uriString.IndexOf(':');
@@ -1102,7 +1106,7 @@ namespace WebSocketSharp {
     /// </param>
     public static byte[] ReadBytes(this Stream stream, int length)
     {
-      if (stream.IsNull() || length <= 0)
+      if (stream == null || length <= 0)
         return new byte[]{};
 
       var buffer  = new byte[length];
@@ -1149,7 +1153,7 @@ namespace WebSocketSharp {
     /// </param>
     public static byte[] ReadBytes(this Stream stream, long length, int bufferLength)
     {
-      if (stream.IsNull() || length <= 0)
+      if (stream == null || length <= 0)
         return new byte[]{};
 
       if (bufferLength <= 0)
@@ -1205,7 +1209,7 @@ namespace WebSocketSharp {
     /// </typeparam>
     public static T[] SubArray<T>(this T[] array, int startIndex, int length)
     {
-      if (array.IsNull() || array.Length == 0)
+      if (array == null || array.Length == 0)
         return new T[]{};
 
       if (startIndex < 0 || length <= 0)
@@ -1234,7 +1238,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this int n, Action act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         ((ulong)n).times(act);
     }
 
@@ -1249,7 +1253,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this long n, Action act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         ((ulong)n).times(act);
     }
 
@@ -1264,7 +1268,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this uint n, Action act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         ((ulong)n).times(act);
     }
 
@@ -1279,7 +1283,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this ulong n, Action act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         n.times(act);
     }
 
@@ -1295,7 +1299,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this int n, Action<int> act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         for (int i = 0; i < n; i++)
           act(i);
     }
@@ -1312,7 +1316,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this long n, Action<long> act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         for (long i = 0; i < n; i++)
           act(i);
     }
@@ -1329,7 +1333,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this uint n, Action<uint> act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         for (uint i = 0; i < n; i++)
           act(i);
     }
@@ -1346,7 +1350,7 @@ namespace WebSocketSharp {
     /// </param>
     public static void Times(this ulong n, Action<ulong> act)
     {
-      if (n > 0 && !act.IsNull())
+      if (n > 0 && act != null)
         for (ulong i = 0; i < n; i++)
           act(i);
     }
@@ -1376,7 +1380,7 @@ namespace WebSocketSharp {
     public static T To<T>(this byte[] src, ByteOrder srcOrder)
       where T : struct
     {
-      if (src.IsNull())
+      if (src == null)
         throw new ArgumentNullException("src");
 
       if (src.Length == 0)
@@ -1504,7 +1508,7 @@ namespace WebSocketSharp {
     /// </exception>
     public static byte[] ToHostOrder(this byte[] src, ByteOrder srcOrder)
     {
-      if (src.IsNull())
+      if (src == null)
         throw new ArgumentNullException("src");
 
       return src.Length == 0 || srcOrder.IsHostOrder()
@@ -1534,14 +1538,14 @@ namespace WebSocketSharp {
     /// </exception>
     public static string ToString<T>(this T[] array, string separator)
     {
-      if (array.IsNull())
+      if (array == null)
         throw new ArgumentNullException("array");
 
       var len = array.Length;
       if (len == 0)
         return String.Empty;
 
-      if (separator.IsNull())
+      if (separator == null)
         separator = String.Empty;
 
       var sb = new StringBuilder();
@@ -1565,7 +1569,7 @@ namespace WebSocketSharp {
     /// </param>
     public static Uri ToUri(this string uriString)
     {
-      return uriString.IsNullOrEmpty()
+      return uriString == null || uriString.Length == 0
              ? null
              : uriString.MaybeUri()
                ? new Uri(uriString)
@@ -1592,11 +1596,11 @@ namespace WebSocketSharp {
     /// </exception>
     public static bool TryCreateWebSocketUri(this string uriString, out Uri result, out string message)
     {
-      if (uriString.IsNull())
+      if (uriString == null)
         throw new ArgumentNullException("uriString");
 
       result = null;
-      if (uriString.IsEmpty())
+      if (uriString.Length == 0)
       {
         message = "Must not be empty.";
         return false;
@@ -1617,7 +1621,7 @@ namespace WebSocketSharp {
       }
 
       var fragment = uri.Fragment;
-      if (!String.IsNullOrEmpty(fragment))
+      if (fragment != null && fragment.Length != 0)
       {
         message = "Must not contain the fragment component: " + uriString;
         return false;
@@ -1661,7 +1665,7 @@ namespace WebSocketSharp {
     /// </param>
     public static string UrlDecode(this string s)
     {
-      return s.IsNullOrEmpty()
+      return s == null || s.Length == 0
              ? s
              : HttpUtility.UrlDecode(s);
     }
@@ -1678,7 +1682,7 @@ namespace WebSocketSharp {
     /// </param>
     public static string UrlEncode(this string s)
     {
-      return s.IsNullOrEmpty()
+      return s == null || s.Length == 0
              ? s
              : HttpUtility.UrlEncode(s);
     }
@@ -1697,10 +1701,10 @@ namespace WebSocketSharp {
     /// </exception>
     public static void WriteContent(this HttpListenerResponse response, byte[] content)
     {
-      if (response.IsNull())
+      if (response == null)
         throw new ArgumentNullException("response");
 
-      if (content.IsNull() || content.Length == 0)
+      if (content == null || content.Length == 0)
         return;
 
       var output = response.OutputStream;
diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll b/websocket-sharp/bin/Debug/websocket-sharp.dll
index f2c3f003..dfa3bc61 100755
Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll and b/websocket-sharp/bin/Debug/websocket-sharp.dll differ
diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
index af86fa4b..4b8ecf2c 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/Release/websocket-sharp.dll b/websocket-sharp/bin/Release/websocket-sharp.dll
index 643eb71b..8a2dc0c8 100755
Binary files a/websocket-sharp/bin/Release/websocket-sharp.dll and b/websocket-sharp/bin/Release/websocket-sharp.dll differ
diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll
index c112d413..c318c3a8 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 22c0bc82..ac79eaa0 100644
--- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
+++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml
@@ -49,9 +49,9 @@
             in the specified array of <see cref="T:System.Char" />.
             </summary>
             <returns>
-                <c>true</c> if <paramref name="str" /> contains any of <paramref name="chars" />; otherwise, <c>false</c>.
+                <c>true</c> if <paramref name="value" /> contains any of <paramref name="chars" />; otherwise, <c>false</c>.
             </returns>
-            <param name="str">
+            <param name="value">
             A <see cref="T:System.String" /> to test.
             </param>
             <param name="chars">
@@ -180,13 +180,14 @@
         </member>
         <member name="M:WebSocketSharp.Ext.GetName(System.String,System.String)">
             <summary>
-            Gets the name from the specified <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            Gets the name from the specified <see cref="T:System.String" /> that contains a pair of name and value
+            separated by a separator string.
             </summary>
             <returns>
             A <see cref="T:System.String" /> that contains the name if any; otherwise, <c>null</c>.
             </returns>
             <param name="nameAndValue">
-            A <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            A <see cref="T:System.String" /> that contains a pair of name and value separated by a separator string.
             </param>
             <param name="separator">
             A <see cref="T:System.String" /> that contains a separator string.
@@ -219,13 +220,14 @@
         </member>
         <member name="M:WebSocketSharp.Ext.GetValue(System.String,System.String)">
             <summary>
-            Gets the value from the specified <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            Gets the value from the specified <see cref="T:System.String" /> that contains a pair of name and value
+            separated by a separator string.
             </summary>
             <returns>
             A <see cref="T:System.String" /> that contains the value if any; otherwise, <c>null</c>.
             </returns>
             <param name="nameAndValue">
-            A <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            A <see cref="T:System.String" /> that contains a pair of name and value separated by a separator string.
             </param>
             <param name="separator">
             A <see cref="T:System.String" /> that contains a separator string.
@@ -266,9 +268,9 @@
             Determines whether the specified <see cref="T:System.String" /> is enclosed in the specified <see cref="T:System.Char" />.
             </summary>
             <returns>
-                <c>true</c> if <paramref name="str" /> is enclosed in <paramref name="c" />; otherwise, <c>false</c>.
+                <c>true</c> if <paramref name="value" /> is enclosed in <paramref name="c" />; otherwise, <c>false</c>.
             </returns>
-            <param name="str">
+            <param name="value">
             A <see cref="T:System.String" /> to test.
             </param>
             <param name="c">
@@ -300,38 +302,6 @@
                 <paramref name="address" /> is <see langword="null" />.
             </exception>
         </member>
-        <member name="M:WebSocketSharp.Ext.IsNull``1(``0)">
-            <summary>
-            Determines whether the specified object is <see langword="null" />.
-            </summary>
-            <returns>
-                <c>true</c> if <paramref name="obj" /> is <see langword="null" />; otherwise, <c>false</c>.
-            </returns>
-            <param name="obj">
-            An <b>object</b> to test.
-            </param>
-            <typeparam name="T">
-            The type of <paramref name="obj" /> parameter.
-            </typeparam>
-        </member>
-        <member name="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action)">
-            <summary>
-            Determines whether the specified object is <see langword="null" />.
-            And invokes the specified <see cref="T:System.Action" /> delegate if the specified object is <see langword="null" />.
-            </summary>
-            <returns>
-                <c>true</c> if the <paramref name="obj" /> parameter is <see langword="null" />; otherwise, <c>false</c>.
-            </returns>
-            <param name="obj">
-            A <b>class</b> to test.
-            </param>
-            <param name="act">
-            An <see cref="T:System.Action" /> delegate that contains the method(s) called if the <paramref name="obj" /> is <see langword="null" />.
-            </param>
-            <typeparam name="T">
-            The type of the <paramref name="obj" /> parameter.
-            </typeparam>
-        </member>
         <member name="M:WebSocketSharp.Ext.IsNullOrEmpty(System.String)">
             <summary>
             Determines whether the specified <see cref="T:System.String" /> is <see langword="null" /> or empty.
diff --git a/websocket-sharp/doc/html/WebSocketSharp/Ext.html b/websocket-sharp/doc/html/WebSocketSharp/Ext.html
index 148c8ab7..9167bd04 100644
--- a/websocket-sharp/doc/html/WebSocketSharp/Ext.html
+++ b/websocket-sharp/doc/html/WebSocketSharp/Ext.html
@@ -362,7 +362,8 @@
                   <b>
                     <a href="#M:WebSocketSharp.Ext.GetName(System.String,System.String)">GetName</a>
                   </b>(<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote>
-            Gets the name from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value are separated by a separator string.
+            Gets the name from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value
+            separated by a separator string.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -395,7 +396,8 @@
                   <b>
                     <a href="#M:WebSocketSharp.Ext.GetValue(System.String,System.String)">GetValue</a>
                   </b>(<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a></nobr><blockquote>
-            Gets the value from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value are separated by a separator string.
+            Gets the value from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value
+            separated by a separator string.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -452,29 +454,6 @@
                     <a href="#M:WebSocketSharp.Ext.IsLocal(System.Net.IPAddress)">IsLocal</a>
                   </b>(<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
             Determines whether the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Net.IPAddress">System.Net.IPAddress</a> represents a local IP address.
-            </blockquote></td>
-              </tr>
-              <tr valign="top">
-                <td>
-                  <div>static </div>
-                </td>
-                <td colspan="2">
-                  <b>
-                    <a href="#M:WebSocketSharp.Ext.IsNull``1(``0)">IsNull&lt;T&gt;</a>
-                  </b>(<i>this</i> <i title="&#xA;            The type of  parameter.&#xA;            ">T</i>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
-            Determines whether the specified object is <tt>null</tt>.
-            </blockquote></td>
-              </tr>
-              <tr valign="top">
-                <td>
-                  <div>static </div>
-                </td>
-                <td colspan="2">
-                  <b>
-                    <a href="#M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action)">IsNullDo&lt;T&gt;</a>
-                  </b>(<i>this</i> <i title="&#xA;            The type of the  parameter.&#xA;            ">T</i>, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action">Action</a>)<nobr> : <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a></nobr><blockquote>
-            Determines whether the specified object is <tt>null</tt>.
-            And invokes the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action">Action</a> delegate if the specified object is <tt>null</tt>.
             </blockquote></td>
               </tr>
               <tr valign="top">
@@ -901,12 +880,12 @@
             in the specified array of <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Char">char</a>.
             </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>Contains</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> str, <b>params</b> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Char">char</a>[] chars)</div>
+          <div class="Signature">public static <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>Contains</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value, <b>params</b> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Char">char</a>[] chars)</div>
           <h4 class="Subsection">Parameters</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.Contains(System.String,System.Char[]):Parameters">
             <dl>
               <dt>
-                <i>str</i>
+                <i>value</i>
               </dt>
               <dd>
             A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to test.
@@ -921,7 +900,7 @@
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.Contains(System.String,System.Char[]):Returns">
-            <tt>true</tt> if <i>str</i> contains any of <i>chars</i>; otherwise, <tt>false</tt>.
+            <tt>true</tt> if <i>value</i> contains any of <i>chars</i>; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Ext.Contains(System.String,System.Char[]):Remarks">
@@ -1265,7 +1244,8 @@
         <h3 id="M:WebSocketSharp.Ext.GetName(System.String,System.String)">GetName Method</h3>
         <blockquote id="M:WebSocketSharp.Ext.GetName(System.String,System.String):member">
           <p class="Summary">
-            Gets the name from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value are separated by a separator string.
+            Gets the name from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value
+            separated by a separator string.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public static <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>GetName</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> nameAndValue, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> separator)</div>
@@ -1276,7 +1256,7 @@
                 <i>nameAndValue</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value are separated by a separator string.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value separated by a separator string.
             </dd>
               <dt>
                 <i>separator</i>
@@ -1370,7 +1350,8 @@
         <h3 id="M:WebSocketSharp.Ext.GetValue(System.String,System.String)">GetValue Method</h3>
         <blockquote id="M:WebSocketSharp.Ext.GetValue(System.String,System.String):member">
           <p class="Summary">
-            Gets the value from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value are separated by a separator string.
+            Gets the value from the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value
+            separated by a separator string.
             </p>
           <h2>Syntax</h2>
           <div class="Signature">public static <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> <b>GetValue</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> nameAndValue, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> separator)</div>
@@ -1381,7 +1362,7 @@
                 <i>nameAndValue</i>
               </dt>
               <dd>
-            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value are separated by a separator string.
+            A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> that contains a pair of name and value separated by a separator string.
             </dd>
               <dt>
                 <i>separator</i>
@@ -1477,12 +1458,12 @@
             Determines whether the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> is enclosed in the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Char">char</a>.
             </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>IsEnclosedIn</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> str, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Char">char</a> c)</div>
+          <div class="Signature">public static <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Boolean">bool</a> <b>IsEnclosedIn</b> (<i>this</i> <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> value, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Char">char</a> c)</div>
           <h4 class="Subsection">Parameters</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsEnclosedIn(System.String,System.Char):Parameters">
             <dl>
               <dt>
-                <i>str</i>
+                <i>value</i>
               </dt>
               <dd>
             A <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.String">string</a> to test.
@@ -1497,7 +1478,7 @@
           </blockquote>
           <h4 class="Subsection">Returns</h4>
           <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsEnclosedIn(System.String,System.Char):Returns">
-            <tt>true</tt> if <i>str</i> is enclosed in <i>c</i>; otherwise, <tt>false</tt>.
+            <tt>true</tt> if <i>value</i> is enclosed in <i>c</i>; otherwise, <tt>false</tt>.
             </blockquote>
           <h2 class="Section">Remarks</h2>
           <div class="SectionBox" id="M:WebSocketSharp.Ext.IsEnclosedIn(System.String,System.Char):Remarks">
@@ -1587,97 +1568,6 @@
             <b>Namespace: </b>WebSocketSharp<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
           <hr size="1" />
         </blockquote>
-        <h3 id="M:WebSocketSharp.Ext.IsNull``1(``0)">IsNull&lt;T&gt; Generic Method</h3>
-        <blockquote id="M:WebSocketSharp.Ext.IsNull``1(``0):member">
-          <p class="Summary">
-            Determines whether the specified object is <tt>null</tt>.
-            </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>IsNull&lt;T&gt;</b> (<i>this</i> <i title="&#xA;            The type of  parameter.&#xA;            ">T</i> obj)<br /> where T : class</div>
-          <h4 class="Subsection">Type Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsNull``1(``0):Type Parameters">
-            <dl>
-              <dt>
-                <i>T</i>
-              </dt>
-              <dd>
-            The type of <i>obj</i> parameter.
-            </dd>
-            </dl>
-          </blockquote>
-          <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsNull``1(``0):Parameters">
-            <dl>
-              <dt>
-                <i>obj</i>
-              </dt>
-              <dd>
-            An object to test.
-            </dd>
-            </dl>
-          </blockquote>
-          <h4 class="Subsection">Returns</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsNull``1(``0):Returns">
-            <tt>true</tt> if <i>obj</i> is <tt>null</tt>; otherwise, <tt>false</tt>.
-            </blockquote>
-          <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Ext.IsNull``1(``0):Remarks">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </div>
-          <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Ext.IsNull``1(``0):Version Information">
-            <b>Namespace: </b>WebSocketSharp<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
-          <hr size="1" />
-        </blockquote>
-        <h3 id="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action)">IsNullDo&lt;T&gt; Generic Method</h3>
-        <blockquote id="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action):member">
-          <p class="Summary">
-            Determines whether the specified object is <tt>null</tt>.
-            And invokes the specified <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action">Action</a> delegate if the specified object is <tt>null</tt>.
-            </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>IsNullDo&lt;T&gt;</b> (<i>this</i> <i title="&#xA;            The type of the  parameter.&#xA;            ">T</i> obj, <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action">Action</a> act)<br /> where T : class</div>
-          <h4 class="Subsection">Type Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action):Type Parameters">
-            <dl>
-              <dt>
-                <i>T</i>
-              </dt>
-              <dd>
-            The type of the <i>obj</i> parameter.
-            </dd>
-            </dl>
-          </blockquote>
-          <h4 class="Subsection">Parameters</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action):Parameters">
-            <dl>
-              <dt>
-                <i>obj</i>
-              </dt>
-              <dd>
-            A class to test.
-            </dd>
-              <dt>
-                <i>act</i>
-              </dt>
-              <dd>
-            An <a href="http://www.go-mono.com/docs/monodoc.ashx?link=T:System.Action">Action</a> delegate that contains the method(s) called if the <i>obj</i> is <tt>null</tt>.
-            </dd>
-            </dl>
-          </blockquote>
-          <h4 class="Subsection">Returns</h4>
-          <blockquote class="SubsectionBox" id="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action):Returns">
-            <tt>true</tt> if the <i>obj</i> parameter is <tt>null</tt>; otherwise, <tt>false</tt>.
-            </blockquote>
-          <h2 class="Section">Remarks</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action):Remarks">
-            <span class="NotEntered">Documentation for this section has not yet been entered.</span>
-          </div>
-          <h2 class="Section">Requirements</h2>
-          <div class="SectionBox" id="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action):Version Information">
-            <b>Namespace: </b>WebSocketSharp<br /><b>Assembly: </b>websocket-sharp (in websocket-sharp.dll)</div>
-          <hr size="1" />
-        </blockquote>
         <h3 id="M:WebSocketSharp.Ext.IsNullOrEmpty(System.String)">IsNullOrEmpty Method</h3>
         <blockquote id="M:WebSocketSharp.Ext.IsNullOrEmpty(System.String):member">
           <p class="Summary">
diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml
index 09f6e93e..fe46f53c 100644
--- a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml
+++ b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml
@@ -77,14 +77,14 @@
       </Docs>
     </Member>
     <Member MemberName="Contains">
-      <MemberSignature Language="C#" Value="public static bool Contains (this string str, char[] chars);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Contains(string str, char[] chars) cil managed" />
+      <MemberSignature Language="C#" Value="public static bool Contains (this string value, char[] chars);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Contains(string value, char[] chars) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="str" Type="System.String" RefType="this" />
+        <Parameter Name="value" Type="System.String" RefType="this" />
         <Parameter Name="chars" Type="System.Char[]">
           <Attributes>
             <Attribute>
@@ -94,7 +94,7 @@
         </Parameter>
       </Parameters>
       <Docs>
-        <param name="str">
+        <param name="value">
             A <see cref="T:System.String" /> to test.
             </param>
         <param name="chars">
@@ -105,7 +105,7 @@
             in the specified array of <see cref="T:System.Char" />.
             </summary>
         <returns>
-          <c>true</c> if <paramref name="str" /> contains any of <paramref name="chars" />; otherwise, <c>false</c>.
+          <c>true</c> if <paramref name="value" /> contains any of <paramref name="chars" />; otherwise, <c>false</c>.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -356,13 +356,14 @@
       </Parameters>
       <Docs>
         <param name="nameAndValue">
-            A <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            A <see cref="T:System.String" /> that contains a pair of name and value separated by a separator string.
             </param>
         <param name="separator">
             A <see cref="T:System.String" /> that contains a separator string.
             </param>
         <summary>
-            Gets the name from the specified <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            Gets the name from the specified <see cref="T:System.String" /> that contains a pair of name and value
+            separated by a separator string.
             </summary>
         <returns>
             A <see cref="T:System.String" /> that contains the name if any; otherwise, <c>null</c>.
@@ -433,13 +434,14 @@
       </Parameters>
       <Docs>
         <param name="nameAndValue">
-            A <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            A <see cref="T:System.String" /> that contains a pair of name and value separated by a separator string.
             </param>
         <param name="separator">
             A <see cref="T:System.String" /> that contains a separator string.
             </param>
         <summary>
-            Gets the value from the specified <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            Gets the value from the specified <see cref="T:System.String" /> that contains a pair of name and value
+            separated by a separator string.
             </summary>
         <returns>
             A <see cref="T:System.String" /> that contains the value if any; otherwise, <c>null</c>.
@@ -501,18 +503,18 @@
       </Docs>
     </Member>
     <Member MemberName="IsEnclosedIn">
-      <MemberSignature Language="C#" Value="public static bool IsEnclosedIn (this string str, char c);" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsEnclosedIn(string str, char c) cil managed" />
+      <MemberSignature Language="C#" Value="public static bool IsEnclosedIn (this string value, char c);" />
+      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsEnclosedIn(string value, char c) cil managed" />
       <MemberType>Method</MemberType>
       <ReturnValue>
         <ReturnType>System.Boolean</ReturnType>
       </ReturnValue>
       <Parameters>
-        <Parameter Name="str" Type="System.String" RefType="this" />
+        <Parameter Name="value" Type="System.String" RefType="this" />
         <Parameter Name="c" Type="System.Char" />
       </Parameters>
       <Docs>
-        <param name="str">
+        <param name="value">
             A <see cref="T:System.String" /> to test.
             </param>
         <param name="c">
@@ -522,7 +524,7 @@
             Determines whether the specified <see cref="T:System.String" /> is enclosed in the specified <see cref="T:System.Char" />.
             </summary>
         <returns>
-          <c>true</c> if <paramref name="str" /> is enclosed in <paramref name="c" />; otherwise, <c>false</c>.
+          <c>true</c> if <paramref name="value" /> is enclosed in <paramref name="c" />; otherwise, <c>false</c>.
             </returns>
         <remarks>To be added.</remarks>
       </Docs>
@@ -576,77 +578,6 @@
             </exception>
       </Docs>
     </Member>
-    <Member MemberName="IsNull&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static bool IsNull&lt;T&gt; (this T obj) where T : class;" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsNull&lt;class T&gt;(!!T obj) cil managed" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T">
-          <Constraints>
-            <ParameterAttribute>ReferenceTypeConstraint</ParameterAttribute>
-          </Constraints>
-        </TypeParameter>
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="obj" Type="T" RefType="this" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">
-            The type of <paramref name="obj" /> parameter.
-            </typeparam>
-        <param name="obj">
-            An <b>object</b> to test.
-            </param>
-        <summary>
-            Determines whether the specified object is <see langword="null" />.
-            </summary>
-        <returns>
-          <c>true</c> if <paramref name="obj" /> is <see langword="null" />; otherwise, <c>false</c>.
-            </returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="IsNullDo&lt;T&gt;">
-      <MemberSignature Language="C#" Value="public static bool IsNullDo&lt;T&gt; (this T obj, Action act) where T : class;" />
-      <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsNullDo&lt;class T&gt;(!!T obj, class System.Action act) cil managed" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>System.Boolean</ReturnType>
-      </ReturnValue>
-      <TypeParameters>
-        <TypeParameter Name="T">
-          <Constraints>
-            <ParameterAttribute>ReferenceTypeConstraint</ParameterAttribute>
-          </Constraints>
-        </TypeParameter>
-      </TypeParameters>
-      <Parameters>
-        <Parameter Name="obj" Type="T" RefType="this" />
-        <Parameter Name="act" Type="System.Action" />
-      </Parameters>
-      <Docs>
-        <typeparam name="T">
-            The type of the <paramref name="obj" /> parameter.
-            </typeparam>
-        <param name="obj">
-            A <b>class</b> to test.
-            </param>
-        <param name="act">
-            An <see cref="T:System.Action" /> delegate that contains the method(s) called if the <paramref name="obj" /> is <see langword="null" />.
-            </param>
-        <summary>
-            Determines whether the specified object is <see langword="null" />.
-            And invokes the specified <see cref="T:System.Action" /> delegate if the specified object is <see langword="null" />.
-            </summary>
-        <returns>
-          <c>true</c> if the <paramref name="obj" /> parameter is <see langword="null" />; otherwise, <c>false</c>.
-            </returns>
-        <remarks>To be added.</remarks>
-      </Docs>
-    </Member>
     <Member MemberName="IsNullOrEmpty">
       <MemberSignature Language="C#" Value="public static bool IsNullOrEmpty (this string value);" />
       <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsNullOrEmpty(string value) cil managed" />
diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml
index 1b30a8c8..563ba9ea 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.4718">
+    <Assembly Name="websocket-sharp" Version="1.0.2.27098">
       <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>
@@ -147,14 +147,14 @@
         <Target Type="T:System.String" />
       </Targets>
       <Member MemberName="Contains">
-        <MemberSignature Language="C#" Value="public static bool Contains (this string str, char[] chars);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Contains(string str, char[] chars) cil managed" />
+        <MemberSignature Language="C#" Value="public static bool Contains (this string value, char[] chars);" />
+        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool Contains(string value, char[] chars) cil managed" />
         <MemberType>ExtensionMethod</MemberType>
         <ReturnValue>
           <ReturnType>System.Boolean</ReturnType>
         </ReturnValue>
         <Parameters>
-          <Parameter Name="str" Type="System.String" RefType="this" />
+          <Parameter Name="value" Type="System.String" RefType="this" />
           <Parameter Name="chars" Type="System.Char[]">
             <Attributes>
               <Attribute>
@@ -164,7 +164,7 @@
           </Parameter>
         </Parameters>
         <Docs>
-          <param name="str">
+          <param name="value">
             A <see cref="T:System.String" /> to test.
             </param>
           <param name="chars">
@@ -447,13 +447,14 @@
         </Parameters>
         <Docs>
           <param name="nameAndValue">
-            A <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            A <see cref="T:System.String" /> that contains a pair of name and value separated by a separator string.
             </param>
           <param name="separator">
             A <see cref="T:System.String" /> that contains a separator string.
             </param>
           <summary>
-            Gets the name from the specified <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            Gets the name from the specified <see cref="T:System.String" /> that contains a pair of name and value
+            separated by a separator string.
             </summary>
         </Docs>
         <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.GetName(System.String,System.String)" />
@@ -530,13 +531,14 @@
         </Parameters>
         <Docs>
           <param name="nameAndValue">
-            A <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            A <see cref="T:System.String" /> that contains a pair of name and value separated by a separator string.
             </param>
           <param name="separator">
             A <see cref="T:System.String" /> that contains a separator string.
             </param>
           <summary>
-            Gets the value from the specified <see cref="T:System.String" /> that contains a pair of name and value are separated by a separator string.
+            Gets the value from the specified <see cref="T:System.String" /> that contains a pair of name and value
+            separated by a separator string.
             </summary>
         </Docs>
         <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.GetValue(System.String,System.String)" />
@@ -598,18 +600,18 @@
         <Target Type="T:System.String" />
       </Targets>
       <Member MemberName="IsEnclosedIn">
-        <MemberSignature Language="C#" Value="public static bool IsEnclosedIn (this string str, char c);" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsEnclosedIn(string str, char c) cil managed" />
+        <MemberSignature Language="C#" Value="public static bool IsEnclosedIn (this string value, char c);" />
+        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsEnclosedIn(string value, char c) cil managed" />
         <MemberType>ExtensionMethod</MemberType>
         <ReturnValue>
           <ReturnType>System.Boolean</ReturnType>
         </ReturnValue>
         <Parameters>
-          <Parameter Name="str" Type="System.String" RefType="this" />
+          <Parameter Name="value" Type="System.String" RefType="this" />
           <Parameter Name="c" Type="System.Char" />
         </Parameters>
         <Docs>
-          <param name="str">
+          <param name="value">
             A <see cref="T:System.String" /> to test.
             </param>
           <param name="c">
@@ -672,81 +674,6 @@
         <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.IsLocal(System.Net.IPAddress)" />
       </Member>
     </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="System.Object" />
-      </Targets>
-      <Member MemberName="IsNull&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static bool IsNull&lt;T&gt; (this T obj) where T : class;" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsNull&lt;class T&gt;(!!T obj) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T">
-            <Constraints>
-              <ParameterAttribute>ReferenceTypeConstraint</ParameterAttribute>
-            </Constraints>
-          </TypeParameter>
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="obj" Type="T" RefType="this" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">
-            The type of <paramref name="obj" /> parameter.
-            </typeparam>
-          <param name="obj">
-            An <b>object</b> to test.
-            </param>
-          <summary>
-            Determines whether the specified object is <see langword="null" />.
-            </summary>
-        </Docs>
-        <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.IsNull``1(``0)" />
-      </Member>
-    </ExtensionMethod>
-    <ExtensionMethod>
-      <Targets>
-        <Target Type="System.Object" />
-      </Targets>
-      <Member MemberName="IsNullDo&lt;T&gt;">
-        <MemberSignature Language="C#" Value="public static bool IsNullDo&lt;T&gt; (this T obj, Action act) where T : class;" />
-        <MemberSignature Language="ILAsm" Value=".method public static hidebysig bool IsNullDo&lt;class T&gt;(!!T obj, class System.Action act) cil managed" />
-        <MemberType>ExtensionMethod</MemberType>
-        <ReturnValue>
-          <ReturnType>System.Boolean</ReturnType>
-        </ReturnValue>
-        <TypeParameters>
-          <TypeParameter Name="T">
-            <Constraints>
-              <ParameterAttribute>ReferenceTypeConstraint</ParameterAttribute>
-            </Constraints>
-          </TypeParameter>
-        </TypeParameters>
-        <Parameters>
-          <Parameter Name="obj" Type="T" RefType="this" />
-          <Parameter Name="act" Type="System.Action" />
-        </Parameters>
-        <Docs>
-          <typeparam name="T">
-            The type of the <paramref name="obj" /> parameter.
-            </typeparam>
-          <param name="obj">
-            A <b>class</b> to test.
-            </param>
-          <param name="act">
-            An <see cref="T:System.Action" /> delegate that contains the method(s) called if the <paramref name="obj" /> is <see langword="null" />.
-            </param>
-          <summary>
-            Determines whether the specified object is <see langword="null" />.
-            And invokes the specified <see cref="T:System.Action" /> delegate if the specified object is <see langword="null" />.
-            </summary>
-        </Docs>
-        <Link Type="WebSocketSharp.Ext" Member="M:WebSocketSharp.Ext.IsNullDo``1(``0,System.Action)" />
-      </Member>
-    </ExtensionMethod>
     <ExtensionMethod>
       <Targets>
         <Target Type="T:System.String" />