diff --git a/.travis.yml b/.travis.yml
index 91ebf1d..8da6c43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,8 @@ language: python
 python:
   - 2.6
   - 2.7
-  - 3.3
+  - 3.5
+  - 3.6
 env:
   global:
   - secure: USjLDneiXlVvEjkUVqTt+LBi0XJ4QhkRcJzqVXA9gEau1NTjAkNTPmHjUbOygp0dkfoV0uWrZKCw6fL1g+HJgWl0vHeHzcNl4mUkA+OwkGFHgaeIhvUfnyyJA8P3Zm21XHC+ehzMpEFN5fVNNhREjnRj+CXMc0FgA6knwBRobu4=
@@ -17,7 +18,7 @@ env:
   - TEST_LIST_SLUG=team
   - TEST_LIST_OWNER_SCREEN_NAME=twitterapi
   - ACCESS_TOKEN_B64=U2FsdGVkX18QdBhvMNshM4PGy04tU3HLwKP+nNSoNZHKsvGLjELcWEXN2LIu/T+yngX1vGONf9lo14ElnfS4k7sfhiru8phR4+rZuBVP3bDvC2A6fXJuhuLqNhBrWqg32WQewvxLWDWBoKmnvRHg5b74GHh+IN/12tU0cBF2HK8=
-install: 
+install:
   - pip install -r requirements.txt
   - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
 script: nosetests -v -w tests/ --logging-filter="twython" --with-cov --cov twython --cov-config .coveragerc --cov-report term-missing
diff --git a/HISTORY.rst b/HISTORY.rst
index 4b0f752..4249539 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 -------
 
+3.6.0 (2017-23-08)
+++++++++++++++++++
+- Improve replacing of entities with links in `html_for_tweet()`
+- Update classifiers for PyPI
+
 3.5.0 (2017-06-06)
 ++++++++++++++++++
 - Added support for "symbols" in `Twython.html_for_tweet()`
diff --git a/docs/conf.py b/docs/conf.py
index 2a22092..601d066 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.5.0'
+version = '3.6.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.5.0'
+release = '3.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 1448fa8..40b05b7 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.5.0'
+__version__ = '3.6.0'
 
 packages = [
     'twython',
@@ -45,8 +45,7 @@ setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ]
 )
diff --git a/twython/__init__.py b/twython/__init__.py
index 7404b28..84e9ee6 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.5.0'
+__version__ = '3.6.0'
 
 from .api import Twython
 from .streaming import TwythonStreamer