diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe
index 44dce630..91b086b8 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 795a58cb..2a1eec19 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 5cf4a381..ef36b94e 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 b5da622e..c418da3e 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 b13636c7..04f37d5c 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 c71207eb..fd797b8d 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 5cf4a381..ef36b94e 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 b5da622e..c418da3e 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 9d4a50c5..5cbd8f98 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 cc8967da..bf5aee8a 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 5cf4a381..ef36b94e 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 b5da622e..c418da3e 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 67b68851..91feb82b 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 557fe8bd..2e69e813 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 5cf4a381..ef36b94e 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 b5da622e..c418da3e 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/Net/WebHeaderCollection.cs b/websocket-sharp/Net/WebHeaderCollection.cs
index 352a74ce..c10d9a09 100644
--- a/websocket-sharp/Net/WebHeaderCollection.cs
+++ b/websocket-sharp/Net/WebHeaderCollection.cs
@@ -467,10 +467,10 @@ namespace WebSocketSharp.Net {
 
 		static string CheckName (string name)
 		{
-			name = Trim (name);
-			if (name.IsEmpty ())
+			if (name.IsNullOrEmpty ())
 				throw new ArgumentNullException ("name");
 
+			name = name.Trim ();
 			if (!IsHeaderName (name))
 				throw new ArgumentException ("Contains invalid characters.", "name");
 
@@ -497,10 +497,10 @@ namespace WebSocketSharp.Net {
 
 		static string CheckValue (string value)
 		{
-			value = Trim (value);
-			if (value.IsEmpty ())
-				return value;
+			if (value.IsNullOrEmpty ())
+				return String.Empty;
 
+			value = value.Trim ();
 			if (value.Length > 65535)
 				throw new ArgumentOutOfRangeException ("value", "The length must not be greater than 65535.");
 
@@ -510,20 +510,10 @@ namespace WebSocketSharp.Net {
 			return value;
 		}
 
-		static string Convert (HttpRequestHeader header)
-		{
-			return Convert (header.ToString ());
-		}
-
-		static string Convert (HttpResponseHeader header)
-		{
-			return Convert (header.ToString ());
-		}
-
-		static string Convert (string header)
+		static string Convert (string key)
 		{
 			HttpHeaderInfo info;
-			return headers.TryGetValue (header, out info)
+			return headers.TryGetValue (key, out info)
 			       ? info.Name
 			       : String.Empty;
 		}
@@ -589,13 +579,6 @@ namespace WebSocketSharp.Net {
 			DoWithoutCheckingName (base.Set, name, value);
 		}
 
-		static string Trim (string value)
-		{
-			return value.IsNullOrEmpty ()
-			       ? String.Empty
-			       : value.Trim ();
-		}
-
 		static bool TryGetHeaderInfo (string name, out HttpHeaderInfo info)
 		{
 			info = GetHeaderInfo (name);
@@ -608,6 +591,16 @@ namespace WebSocketSharp.Net {
 
 		#region Internal Methods
 
+		internal static string Convert (HttpRequestHeader header)
+		{
+			return Convert (header.ToString ());
+		}
+
+		internal static string Convert (HttpResponseHeader header)
+		{
+			return Convert (header.ToString ());
+		}
+
 		internal static bool IsHeaderName (string name)
 		{
 			return name.IsNullOrEmpty ()
diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
index 5cf4a381..ef36b94e 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 b5da622e..c418da3e 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/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb
index 51ed3721..628afcbf 100644
Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ