diff --git a/CHANGELOG.md b/CHANGELOG.md
index a597b4d..e133ccd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0-beta.1-nullsafety.0
+
+Support null safety on 2.0.0-beta
+
 ## 2.0.0-beta.1
 
 **Bug fix:**
diff --git a/lib/src/util/event_emitter.dart b/lib/src/util/event_emitter.dart
index 7da360a..2916c70 100644
--- a/lib/src/util/event_emitter.dart
+++ b/lib/src/util/event_emitter.dart
@@ -24,12 +24,14 @@ class EventEmitter {
   /**
    * Mapping of events to a list of event handlers
    */
-  Map<String, List<EventHandler>> _events = new HashMap<String, List<EventHandler>>();
+  Map<String, List<EventHandler>> _events =
+      new HashMap<String, List<EventHandler>>();
 
   /**
    * Mapping of events to a list of one-time event handlers
    */
-  Map<String, List<EventHandler>> _eventsOnce = new HashMap<String, List<EventHandler>>();
+  Map<String, List<EventHandler>> _eventsOnce =
+      new HashMap<String, List<EventHandler>>();
 
   /**
    * Constructor
diff --git a/pubspec.yaml b/pubspec.yaml
index 18d8c99..14d828f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: socket_io_common
 description: Socket.io common parser library.
-version: 2.0.0-beta-nullsafety.0
+version: 2.0.0-beta.1-nullsafety.0
 homepage: https://www.zkoss.org
 repository: https://github.com/rikulo/socket_io_common
 issue_tracker: https://github.com/rikulo/socket_io_common/issues