diff --git a/CHANGES.md b/CHANGES.md
index 49c27ea5..f62bf300 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,18 @@
 
 Here you can see the full list of changes between each BioSPPy release.
 
+Version 0.5.0
+-------------
+
+Released on August 28th 2017
+
+- Added a simple timing module
+- Added methods to help with file manipulations
+- Added a logo :camera:
+- Added the Matthews Correlation Coefficient as another authentication metric.
+- Fixed an issue in the ECG Hamilton algorithm (closes #28)
+- Various bug fixes
+
 Version 0.4.0
 -------------
 
diff --git a/biosppy/version.py b/biosppy/version.py
index 5479daf3..967e8a6c 100644
--- a/biosppy/version.py
+++ b/biosppy/version.py
@@ -9,4 +9,4 @@
 :license: BSD 3-clause, see LICENSE for more details.
 """
 
-version = '0.4.0'
+version = '0.5.0'
diff --git a/docs/conf.py b/docs/conf.py
index d0425edd..db96a195 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,8 +13,8 @@
 # serve to show the default.
 
 import sys
-import os
-import shlex
+# import os
+# import shlex
 
 # To be able to import to ReadTheDocs
 from mock import Mock as MagicMock
@@ -85,7 +85,7 @@ def __getattr__(cls, name):
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.0'
+version = '0.5.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index c76cfaf2..0f617c66 100644
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,7 @@ def get_version(path):
                    'Programming Language :: Python',
                    'Programming Language :: Python :: 2.7',
                    'Programming Language :: Python :: 3.5',
+                   'Programming Language :: Python :: 3.6',
                    'Topic :: Software Development :: Libraries :: Python Modules',
                    'Topic :: Education',
                    'Topic :: Scientific/Engineering',