diff --git a/HISTORY.rst b/HISTORY.rst
index 4087a68..75964ff 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,15 @@
 History
 -------
 
+3.7.0 (2018-07-05)
+++++++++++++++++++
+- Fixes for cursoring API endpoints
+- Improve `html_for_tweet()` parsing
+- Documentation cleanup
+- Documentation for cursor's `return_pages` keyword argument
+- Update links to Twitter API in documentation
+- Added `create_metadata` endpoint
+- Raise error for when cursor is not provided a callable
 
 3.6.0 (2017-23-08)
 ++++++++++++++++++
diff --git a/docs/conf.py b/docs/conf.py
index 601d066..8f3c3d2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = u'2013, Ryan McGrath'
 # built documents.
 #
 # The short X.Y version.
-version = '3.6.0'
+version = '3.7.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.6.0'
+release = '3.7.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/get_direct_message example b/examples/get_direct_messages.py
similarity index 100%
rename from get_direct_message example
rename to examples/get_direct_messages.py
diff --git a/setup.py b/setup.py
index 40b05b7..11cc2b4 100755
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ except ImportError:
     from distutils.core import setup
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '3.6.0'
+__version__ = '3.7.0'
 
 packages = [
     'twython',
diff --git a/twython/__init__.py b/twython/__init__.py
index 84e9ee6..dc161d1 100644
--- a/twython/__init__.py
+++ b/twython/__init__.py
@@ -19,7 +19,7 @@ Questions, comments? ryan@venodesigns.net
 """
 
 __author__ = 'Ryan McGrath <ryan@venodesigns.net>'
-__version__ = '3.6.0'
+__version__ = '3.7.0'
 
 from .api import Twython
 from .streaming import TwythonStreamer