diff --git a/ChangeLog b/ChangeLog
index 959589a..bbe8480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 ChangeLog
 ============
 
+- 0.36.0
+  - added support for using custom connection class(#235)
+  - use Named logger(#238)
+  - implement ping/pong timeout(#241)
+  - Corrects the syntax highlight code(#243)
+
 - 0.35.0
   - Prints timings in console (#217)
   - use inspect.getfullargspec with Python 3.x (#219)
diff --git a/setup.py b/setup.py
index 40172f3..5dc7299 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 import sys
 
-VERSION = "0.35.0"
+VERSION = "0.36.0"
 NAME="websocket_client"
 
 install_requires = ["six"]
diff --git a/websocket/__init__.py b/websocket/__init__.py
index 7629318..29939b1 100644
--- a/websocket/__init__.py
+++ b/websocket/__init__.py
@@ -22,4 +22,4 @@ Copyright (C) 2010 Hiroki Ohtani(liris)
 from ._core import *
 from ._app import WebSocketApp
 
-__version__ = "0.35.0"
+__version__ = "0.36.0"