diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe
index 7fdde136..c9867a04 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 8ffc1471..2ba75d24 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 cf77c38d..15945d58 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 d02c12e6..99628d61 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 81c7f7b6..145ec9e9 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 b6cf289e..f4f87c08 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 cf77c38d..15945d58 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 d02c12e6..99628d61 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 4fc955d6..f6233c7e 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 c917e9f1..a0759633 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 cf77c38d..15945d58 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 d02c12e6..99628d61 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 33fa550f..e95873d7 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 707e27e2..8cd885a3 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 cf77c38d..15945d58 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 d02c12e6..99628d61 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/CloseEventArgs.cs b/websocket-sharp/CloseEventArgs.cs
index a678ab78..3df14d50 100644
--- a/websocket-sharp/CloseEventArgs.cs
+++ b/websocket-sharp/CloseEventArgs.cs
@@ -36,16 +36,16 @@ namespace WebSocketSharp {
   /// </summary>
   /// <remarks>
   /// The <see cref="WebSocket.OnClose"/> event occurs when the WebSocket receives a close control frame or
-  /// the <c>WebSocket.Close</c> method is called. If you want to get the reason for closure, you should access the <see cref="CloseEventArgs.Code"/> or
-  /// <see cref="CloseEventArgs.Reason"/> properties.
+  /// the <c>WebSocket.Close</c> method is called. If you want to get the reason for closure, you should access
+  /// the <see cref="CloseEventArgs.Code"/> or <see cref="CloseEventArgs.Reason"/> properties.
   /// </remarks>
   public class CloseEventArgs : MessageEventArgs
   {
     #region Fields
 
+    private bool   _clean;
     private ushort _code;
     private string _reason;
-    private bool   _wasClean;
 
     #endregion
 
@@ -54,18 +54,9 @@ namespace WebSocketSharp {
     internal CloseEventArgs(PayloadData data)
       : base(Opcode.CLOSE, data)
     {
-      _code     = (ushort)CloseStatusCode.NO_STATUS_CODE;
-      _reason   = String.Empty;
-      _wasClean = false;
-
-      if (data.Length >= 2)
-        _code = data.ToBytes().SubArray(0, 2).To<ushort>(ByteOrder.BIG);
-
-      if (data.Length > 2)
-      {
-        var buffer = data.ToBytes().SubArray(2, (int)(data.Length - 2));
-        _reason = Encoding.UTF8.GetString(buffer);
-      }
+      _code   = getCodeFrom(data);
+      _reason = getReasonFrom(data);
+      _clean  = false;
     }
 
     #endregion
@@ -97,21 +88,41 @@ namespace WebSocketSharp {
     }
 
     /// <summary>
-    /// Indicates whether the connection closed cleanly or not.
+    /// Indicates whether the WebSocket connection closed cleanly.
     /// </summary>
     /// <value>
-    /// <c>true</c> if the connection closed cleanly; otherwise, <c>false</c>.
+    /// <c>true</c> if the WebSocket connection closed cleanly; otherwise, <c>false</c>.
     /// </value>
     public bool WasClean {
       get {
-        return _wasClean;
+        return _clean;
       }
 
       internal set {
-        _wasClean = value;
+        _clean = value;
       }
     }
 
     #endregion
+
+    #region Private Method
+
+    private ushort getCodeFrom(PayloadData data)
+    {
+      return data.Length >= 2
+             ? data.ToBytes().SubArray(0, 2).To<ushort>(ByteOrder.BIG)
+             : (ushort)CloseStatusCode.NO_STATUS_CODE;
+    }
+
+    private string getReasonFrom(PayloadData data)
+    {
+      if (data.Length <= 2)
+        return String.Empty;
+
+      var buffer = data.ToBytes().SubArray(2, (int)(data.Length - 2));
+      return Encoding.UTF8.GetString(buffer);
+    }
+
+    #endregion
   }
 }
diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll
index cf77c38d..15945d58 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 d02c12e6..99628d61 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 d0f003d7..c65d8469 100644
Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ