diff --git a/pom.xml b/pom.xml
index 683d09743..a40eb2d31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
  <groupId>com.corundumstudio.socketio</groupId>
  <artifactId>netty-socketio</artifactId>
- <version>1.7.20-SNAPSHOT</version>
+ <version>1.7.20</version>
  <packaging>bundle</packaging>
  <name>NettySocketIO</name>
  <description>Socket.IO server implemented on Java</description>
@@ -85,37 +85,37 @@
   <dependency>
   	<groupId>io.netty</groupId>
   	<artifactId>netty-buffer</artifactId>
-  	<version>4.1.73.Final</version>
+  	<version>4.1.74.Final</version>
   </dependency>
   <dependency>
   	<groupId>io.netty</groupId>
   	<artifactId>netty-common</artifactId>
-  	<version>4.1.73.Final</version>
+  	<version>4.1.74.Final</version>
   </dependency>
   <dependency>
   	<groupId>io.netty</groupId>
   	<artifactId>netty-transport</artifactId>
-       <version>4.1.73.Final</version>
+       <version>4.1.74.Final</version>
   </dependency>
   <dependency>
   	<groupId>io.netty</groupId>
   	<artifactId>netty-handler</artifactId>
-  	<version>4.1.73.Final</version>
+  	<version>4.1.74.Final</version>
   </dependency>
   <dependency>
   	<groupId>io.netty</groupId>
   	<artifactId>netty-codec-http</artifactId>
-  	<version>4.1.73.Final</version>
+  	<version>4.1.74.Final</version>
   </dependency>
   <dependency>
   	<groupId>io.netty</groupId>
   	<artifactId>netty-codec</artifactId>
-  	<version>4.1.73.Final</version>
+  	<version>4.1.74.Final</version>
   </dependency>
   <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
-        <version>4.1.73.Final</version>
+        <version>4.1.74.Final</version>
   </dependency>
   
   <dependency>
@@ -134,31 +134,31 @@
   <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.33</version>
+      <version>1.7.36</version>
   </dependency>
 
   <dependency>
   	<groupId>com.fasterxml.jackson.core</groupId>
   	<artifactId>jackson-core</artifactId>
-  	<version>2.13.1</version>
+  	<version>2.13.2</version>
   </dependency>
   <dependency>
   	<groupId>com.fasterxml.jackson.core</groupId>
   	<artifactId>jackson-databind</artifactId>
-  	<version>2.13.1</version>
+  	<version>2.13.2</version>
   </dependency>
 
 
   <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>5.3.14</version>
+      <version>5.3.16</version>
       <scope>provided</scope>
   </dependency>
   <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>5.3.14</version>
+      <version>5.3.16</version>
       <exclusions>
          <exclusion>
              <groupId>commons-logging</groupId>
@@ -172,7 +172,7 @@
     <dependency>
         <groupId>org.redisson</groupId>
         <artifactId>redisson</artifactId>
-        <version>3.16.7</version>
+        <version>3.16.8</version>
         <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/src/main/java/com/corundumstudio/socketio/ClientOperations.java b/src/main/java/com/corundumstudio/socketio/ClientOperations.java
index dc576608f..4157d769a 100644
--- a/src/main/java/com/corundumstudio/socketio/ClientOperations.java
+++ b/src/main/java/com/corundumstudio/socketio/ClientOperations.java
@@ -38,6 +38,12 @@ public interface ClientOperations {
      */
     void disconnect();
 
+    /**
+     * Disconnect client
+     *
+     */
+    void close();
+
     /**
      * Send event
      *
diff --git a/src/main/java/com/corundumstudio/socketio/MultiRoomBroadcastOperations.java b/src/main/java/com/corundumstudio/socketio/MultiRoomBroadcastOperations.java
index aee3e054d..d941e33b8 100644
--- a/src/main/java/com/corundumstudio/socketio/MultiRoomBroadcastOperations.java
+++ b/src/main/java/com/corundumstudio/socketio/MultiRoomBroadcastOperations.java
@@ -105,6 +105,16 @@ public void disconnect() {
         }
     }
 
+    @Override
+    public void close() {
+        if( this.broadcastOperations == null || this.broadcastOperations.size() == 0 ) {
+            return;
+        }
+        for( BroadcastOperations b : this.broadcastOperations ) {
+            b.close();
+        }
+    }
+
     @Override
     public void sendEvent(String name, Object... data) {
         if( this.broadcastOperations == null || this.broadcastOperations.size() == 0 ) {
diff --git a/src/main/java/com/corundumstudio/socketio/SingleRoomBroadcastOperations.java b/src/main/java/com/corundumstudio/socketio/SingleRoomBroadcastOperations.java
index a0c871908..cd1240fc3 100644
--- a/src/main/java/com/corundumstudio/socketio/SingleRoomBroadcastOperations.java
+++ b/src/main/java/com/corundumstudio/socketio/SingleRoomBroadcastOperations.java
@@ -77,6 +77,13 @@ public void disconnect() {
         }
     }
 
+    @Override
+    public void close() {
+        for (SocketIOClient client : clients) {
+            client.close();
+        }
+    }
+
     @Override
     public void sendEvent(String name, SocketIOClient excludedClient, Object... data) {
         Packet packet = new Packet(PacketType.MESSAGE);
diff --git a/src/main/java/com/corundumstudio/socketio/SocketIOServer.java b/src/main/java/com/corundumstudio/socketio/SocketIOServer.java
index 83f4b92ab..fbbb37331 100644
--- a/src/main/java/com/corundumstudio/socketio/SocketIOServer.java
+++ b/src/main/java/com/corundumstudio/socketio/SocketIOServer.java
@@ -248,12 +248,22 @@ public <T> void addEventListener(String eventName, Class<T> eventClass, DataList
         mainNamespace.addEventListener(eventName, eventClass, listener);
     }
 
+    @Override
+    public void removeEventListener(DataListener listener) {
+        mainNamespace.removeEventListener(listener);
+    }
+
     @Override
     public void addEventInterceptor(EventInterceptor eventInterceptor) {
         mainNamespace.addEventInterceptor(eventInterceptor);
 
     }
 
+    @Override
+    public void removeEventInterceptor(EventInterceptor eventInterceptor) {
+        mainNamespace.removeEventInterceptor(eventInterceptor);
+    }
+
 
     @Override
     public void removeAllListeners(String eventName) {
@@ -265,25 +275,39 @@ public void addDisconnectListener(DisconnectListener listener) {
         mainNamespace.addDisconnectListener(listener);
     }
 
+    @Override
+    public void removeDisconnectListener(DisconnectListener listener) {
+        mainNamespace.removeDisconnectListener(listener);
+    }
+
     @Override
     public void addConnectListener(ConnectListener listener) {
         mainNamespace.addConnectListener(listener);
     }
 
+    @Override
+    public void removeConnectListener(ConnectListener listener) {
+        mainNamespace.removeConnectListener(listener);
+    }
+
     @Override
     public void addPingListener(PingListener listener) {
         mainNamespace.addPingListener(listener);
     }
 
+    @Override
+    public void removePingListener(PingListener listener) {
+        mainNamespace.removePingListener(listener);
+    }
+
     @Override
     public void addListeners(Object listeners) {
         mainNamespace.addListeners(listeners);
     }
-    
+
     @Override
     public void addListeners(Object listeners, Class<?> listenersClass) {
         mainNamespace.addListeners(listeners, listenersClass);
     }
 
-
 }
diff --git a/src/main/java/com/corundumstudio/socketio/listener/ClientListeners.java b/src/main/java/com/corundumstudio/socketio/listener/ClientListeners.java
index af6b82a2c..20b1b6c06 100644
--- a/src/main/java/com/corundumstudio/socketio/listener/ClientListeners.java
+++ b/src/main/java/com/corundumstudio/socketio/listener/ClientListeners.java
@@ -22,14 +22,24 @@ public interface ClientListeners {
 
     <T> void addEventListener(String eventName, Class<T> eventClass, DataListener<T> listener);
 
+    void removeEventListener(DataListener listener);
+
     void addEventInterceptor(EventInterceptor eventInterceptor);
 
+    void removeEventInterceptor(EventInterceptor eventInterceptor);
+
     void addDisconnectListener(DisconnectListener listener);
 
+    void removeDisconnectListener(DisconnectListener listener);
+
     void addConnectListener(ConnectListener listener);
 
+    void removeConnectListener(ConnectListener listener);
+
     void addPingListener(PingListener listener);
 
+    void removePingListener(PingListener listener);
+
     void addListeners(Object listeners);
 
     void addListeners(Object listeners, Class<?> listenersClass);
diff --git a/src/main/java/com/corundumstudio/socketio/namespace/Namespace.java b/src/main/java/com/corundumstudio/socketio/namespace/Namespace.java
index 97057dd0e..132b702af 100644
--- a/src/main/java/com/corundumstudio/socketio/namespace/Namespace.java
+++ b/src/main/java/com/corundumstudio/socketio/namespace/Namespace.java
@@ -128,11 +128,35 @@ public <T> void addEventListener(String eventName, Class<T> eventClass, DataList
         jsonSupport.addEventMapping(name, eventName, eventClass);
     }
 
+    @Override
+    public void removeEventListener(DataListener listener) {
+        List<String> needRemove = new ArrayList<String>();
+
+        for (Map.Entry<String, EventEntry<?>> entry : eventListeners.entrySet()) {
+            if(entry.getValue().getListeners().contains(listener)){
+                entry.getValue().getListeners().remove(listener);
+            }
+            if(entry.getValue().getListeners().size() == 0){
+                needRemove.add(entry.getKey());
+            }
+        }
+
+        for(String eventName : needRemove){
+            eventListeners.remove(eventName);
+            jsonSupport.removeEventMapping(name, eventName);
+        }
+    }
+
     @Override
     public void addEventInterceptor(EventInterceptor eventInterceptor) {
         eventInterceptors.add(eventInterceptor);
     }
 
+    @Override
+    public void removeEventInterceptor(EventInterceptor eventInterceptor) {
+        eventInterceptors.remove(eventInterceptor);
+    }
+
     @SuppressWarnings({"rawtypes", "unchecked"})
     public void onEvent(NamespaceClient client, String eventName, List<Object> args, AckRequest ackRequest) {
         EventEntry entry = eventListeners.get(eventName);
@@ -184,6 +208,11 @@ public void addDisconnectListener(DisconnectListener listener) {
         disconnectListeners.add(listener);
     }
 
+    @Override
+    public void removeDisconnectListener(DisconnectListener listener) {
+        disconnectListeners.remove(listener);
+    }
+
     public void onDisconnect(SocketIOClient client) {
         Set<String> joinedRooms = client.getAllRooms();        
         allClients.remove(client.getSessionId());
@@ -209,6 +238,11 @@ public void addConnectListener(ConnectListener listener) {
         connectListeners.add(listener);
     }
 
+    @Override
+    public void removeConnectListener(ConnectListener listener) {
+        connectListeners.remove(listener);
+    }
+
     public void onConnect(SocketIOClient client) {
         join(getName(), client.getSessionId());
         storeFactory.pubSubStore().publish(PubSubType.JOIN, new JoinLeaveMessage(client.getSessionId(), getName(), getName()));
@@ -227,6 +261,11 @@ public void addPingListener(PingListener listener) {
         pingListeners.add(listener);
     }
 
+    @Override
+    public void removePingListener(PingListener listener) {
+        pingListeners.remove(listener);
+    }
+
     public void onPing(SocketIOClient client) {
         try {
             for (PingListener listener : pingListeners) {
diff --git a/src/main/java/com/corundumstudio/socketio/transport/NamespaceClient.java b/src/main/java/com/corundumstudio/socketio/transport/NamespaceClient.java
index 43e97ec7c..cbea30c99 100644
--- a/src/main/java/com/corundumstudio/socketio/transport/NamespaceClient.java
+++ b/src/main/java/com/corundumstudio/socketio/transport/NamespaceClient.java
@@ -122,7 +122,12 @@ public void disconnect() {
         Packet packet = new Packet(PacketType.MESSAGE);
         packet.setSubType(PacketType.DISCONNECT);
         send(packet);
-//        onDisconnect();
+        //onDisconnect();
+    }
+
+    @Override
+    public void close() {
+        getBaseClient().disconnect();
     }
 
     @Override