diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..bb5ec0d
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,50 @@
+=======
+History
+=======
+
+0.1.6 (2019-05-9)
+------------------
+
+* merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/90>`_ Fix lease util keeping problems
+* merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/89>`_ Add range end and lease to txn
+* merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/87>`_ Add handel null value as gogoproto does while modelizing response data
+* merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/82>`_ Fix watch util issue #18 and #78
+* merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/79>`_ Improve etcd comapabitity of multiple versions
+* merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/51>`_ Add a base EtcdModel to all dynamic created model
+* merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/42>`_ Improve etcd comapabitity of multiple versions
+
+
+0.1.5 (2018-07-4)
+------------------
+
+merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/34>`_ enum34 only where it's needed
+
+
+0.1.4 (2018-03-30)
+------------------
+
+* better code quality
+* support etcd v3.2.2+
+
+
+0.1.3 (2018-03-21)
+------------------
+
+finished lock util
+
+
+0.1.2 (2018-03-20)
+------------------
+
+* Add more test
+* Add watcher, transaction and lease util
+
+You can try it at dev environment
+
+
+0.1.0 (2018-03-19)
+------------------
+
+* Implemented all APIs of etcd3's gRPC-JSON-Gateway
+
+* Stateful utils (Watcher Lease Lock Transaction) are in progress
diff --git a/HISTORY.rst b/HISTORY.rst
deleted file mode 100644
index 8df4b9d..0000000
--- a/HISTORY.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-=======
-History
-=======
-
-0.1.5 (2018-07-4)
-------------------
-
-merge pull request `#34 <https://github.com/Revolution1/etcd3-py/pull/34>`_ enum34 only where it's needed
-
-0.1.4 (2018-03-30)
-------------------
-
-* better code quality
-* support etcd v3.2.2+
-
-
-0.1.3 (2018-03-21)
-------------------
-
-finished lock util
-
-0.1.2 (2018-03-20)
-------------------
-
-* Add more test
-* Add watcher, transaction and lease util
-
-You can try it at dev environment
-
-0.1.0 (2018-03-19)
-------------------
-
-* Implemented all APIs of etcd3's gRPC-JSON-Gateway
-
-* Stateful utils (Watcher Lease Lock Transaction) are in progress
diff --git a/MANIFEST.in b/MANIFEST.in
index ff6205f..b9e3cef 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include AUTHORS.rst
 include CONTRIBUTING.rst
-include HISTORY.rst
+include CHANGELOG.rst
 include LICENSE
 include README.md
 include requirements*.txt
diff --git a/docs/history.rst b/docs/history.rst
index 2506499..565b052 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -1 +1 @@
-.. include:: ../HISTORY.rst
+.. include:: ../CHANGELOG.rst
diff --git a/etcd3/version.py b/etcd3/version.py
index 6c65caa..d61ea3f 100644
--- a/etcd3/version.py
+++ b/etcd3/version.py
@@ -1,3 +1,3 @@
 __author__ = 'Renjie Cai'
 __email__ = 'revol.cai@gmail.com'
-__version__ = '0.1.5'
+__version__ = '0.1.6'
diff --git a/setup.cfg b/setup.cfg
index 5f2bf00..35bfbec 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.5
+current_version = 0.1.6
 commit = False
 tag = False
 
@@ -22,3 +22,4 @@ test = pytest
 
 [metadata]
 license_file = LICENSE
+
diff --git a/setup.py b/setup.py
index 9f53227..82ef6be 100755
--- a/setup.py
+++ b/setup.py
@@ -5,21 +5,26 @@
 import os
 import platform
 
-try: # for pip >= 10
+SHORT_DESCRIPTION = "Python client for etcd v3 (Using gRPC-JSON-Gateway)"
+
+try:  # for pip >= 10
     from pip._internal.req import parse_requirements
-except ImportError: # for pip <= 9.0.3
+except ImportError:  # for pip <= 9.0.3
     from pip.req import parse_requirements
 from setuptools import setup, find_packages
 
 PY2 = platform.python_version_tuple()[0] == '2'
 
+print(SHORT_DESCRIPTION)
+print(os.listdir(os.curdir))
+
 readme_path = 'README.md'
 if os.path.isfile('README.rst'):
     readme_path = 'README.rst'
 with open(readme_path) as readme_file:
     readme = readme_file.read()
 
-with open('HISTORY.rst') as history_file:
+with open('CHANGELOG.rst') as history_file:
     history = history_file.read()
 
 # parse_requirements() returns generator of pip.req.InstallRequirement objects
@@ -46,8 +51,8 @@
 
 setup(
     name='etcd3-py',
-    version='0.1.5',
-    description="Python client for etcd v3 (Using gRPC-JSON-Gateway)",
+    version='0.1.6',
+    description=SHORT_DESCRIPTION,
     long_description=readme + '\n\n' + history,
     author="Renjie Cai",
     author_email='revol.cai@gmail.com',
@@ -75,6 +80,7 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
     test_suite='tests',
     tests_require=test_requirements,