diff --git a/websocket-sharp/Net/EndPointListener.cs b/websocket-sharp/Net/EndPointListener.cs
index 77cb3dd3..56d5441d 100644
--- a/websocket-sharp/Net/EndPointListener.cs
+++ b/websocket-sharp/Net/EndPointListener.cs
@@ -127,12 +127,24 @@ namespace WebSocketSharp.Net
 
     #region Public Properties
 
+    public IPAddress Address {
+      get {
+        return _endpoint.Address;
+      }
+    }
+
     public bool IsSecure {
       get {
         return _secure;
       }
     }
 
+    public int Port {
+      get {
+        return _endpoint.Port;
+      }
+    }
+
     public ServerSslConfiguration SslConfiguration {
       get {
         return _sslConfig;