diff --git a/CHANGES.md b/CHANGES.md
index a25c173b..49c27ea5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,20 @@
 
 Here you can see the full list of changes between each BioSPPy release.
 
+Version 0.4.0
+-------------
+
+Released on May 2nd 2017
+
+- Fixed array indexing with floats (merges #23)
+- Allow user to modify SCRs rejection treshold (merges #24)
+- Fixed the Scikit-Learn cross-validation module deprecation (closes #18)
+- Addd methods to compute mean and meadian of a set of n-dimensional data points
+- Added methods to compute the matrix profile
+- Added new EMG onset detection algorithms (merges #17)
+- Added finite difference method for numerial derivatives
+- Fixed inconsistent decibel usage in plotting (closes #16)
+
 Version 0.3.0
 -------------
 
diff --git a/biosppy/version.py b/biosppy/version.py
index a7d1ebfc..5479daf3 100644
--- a/biosppy/version.py
+++ b/biosppy/version.py
@@ -9,4 +9,4 @@
 :license: BSD 3-clause, see LICENSE for more details.
 """
 
-version = '0.3.1'
+version = '0.4.0'
diff --git a/docs/conf.py b/docs/conf.py
index 0cdb0601..ca532464 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ def __getattr__(cls, name):
                 'scipy.stats', 'scipy.cluster', 'scipy.cluster.hierarchy',
                 'scipy.cluster.vq', 'scipy.sparse', 'scipy.spatial',
                 'scipy.spatial.distance', 'sklearn', 'sklearn.cluster',
-                'sklearn.grid_search', 'sklearn.externals',
+                'sklearn.model_selection', 'sklearn.externals',
                 'matplotlib.gridspec', 'h5py', 'shortuuid', 'bidict', 'svm',
                 'sksvm']
 
@@ -55,7 +55,7 @@ def __getattr__(cls, name):
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
     'sphinx.ext.napoleon',
-    'sphinx.ext.pngmath',
+    'sphinx.ext.imgmath',
 ]
 
 # Napoleon settings
@@ -85,9 +85,9 @@ def __getattr__(cls, name):
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.0'
+version = '0.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.0'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -297,7 +297,7 @@ def __getattr__(cls, name):
 #  dir menu entry, description, category)
 texinfo_documents = [
   (master_doc, 'BioSPPy', 'BioSPPy Documentation',
-   author, 'BioSPPy', 'One line description of project.',
+   author, 'BioSPPy', 'Biosignal Processing in Python.',
    'Miscellaneous'),
 ]