diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 327d3b0..2a44d08 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -14,7 +14,7 @@
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("0.1.0")]
+[assembly: AssemblyVersion("0.2.0")]
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
 //[assembly: AssemblyDelaySign(false)]
diff --git a/README.md b/README.md
index ba31e32..38e9b71 100644
--- a/README.md
+++ b/README.md
@@ -31,13 +31,10 @@ Convars available:
 ### Add a listener to receive messages
 
 ```lua
--- Create a listener with a string parameter
-AddEventHandler("my:listener", function(message)
+-- Add a new listener with a string parameter
+AddEventHandler("WebSocketServer:onMessage", function(message)
     print("Received message: " .. message)
 end)
-
--- Add your listener to WebSockerServer
-TriggerEvent("WebSocketServer:addListener", "my:listener");
 ```
 
 ### Send a message to connected WebSocket clients
diff --git a/WebSocketServer.cs b/WebSocketServer.cs
index 172c459..ad9921e 100644
--- a/WebSocketServer.cs
+++ b/WebSocketServer.cs
@@ -14,7 +14,6 @@ private enum LogLevels { Debug, Info, Warn, Error };
 		private LogLevels logLevel;
 
 		private string authorization;
-		private List<string> events;
 		private List<WebSocket> webSockets;
 
 		public WebSocketServer()
@@ -22,18 +21,6 @@ public WebSocketServer()
 			logLevel = Function.Call<string>(Hash.GET_CONVAR, "websocket_debug", "false") == "true" ? LogLevels.Debug : LogLevels.Info;
 			authorization = Function.Call<string>(Hash.GET_CONVAR, "websocket_authorization", "");
 
-			events = new List<string>();
-			EventHandlers["WebSocketServer:addListener"] += new Action<dynamic>((dynamic eventName) =>
-			{
-				lock (events)
-				{
-					if (!events.Contains((string) eventName))
-					{
-						events.Add((string) eventName);
-					}
-				}
-			});
-
 			webSockets = new List<WebSocket>();
 			EventHandlers["WebSocketServer:broadcast"] += new Action<dynamic>((dynamic message) =>
 			{
@@ -94,13 +81,7 @@ public WebSocketServer()
 			{
 				Log("Received message: " + msg, LogLevels.Debug);
 
-				lock (events)
-				{
-					foreach (var eventName in events)
-					{
-						TriggerEvent(eventName, msg);
-					}
-				}
+				TriggerEvent("WebSocketServer:onMessage", msg);
 			};
 
 			try