diff --git a/AUTHORS.md b/AUTHORS.md
index 705ab126..06d39dd5 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,6 +1,6 @@
 BioSPPy is written and maintained by the [ScientISST](https://github.com/scientisst) team.
 
-Maintainers
+Current Maintainers
 -----------
 
 - Rafael Silva [@rafaelscsilva](https://github.com/rafaelscsilva)
@@ -10,8 +10,15 @@ Maintainers
 Main Contributors
 -----------------
 
+- Carlos Carreiras <carlos.carreiras@lx.it.pt> (Original Development Lead)
+
+- Ana Priscila Alves <anapriscila.alves@lx.it.pt>
+- André Lourenço <arlourenco@lx.it.pt>
+- Filipe Canento <fcanento@lx.it.pt>
+- Hugo Silva [@hugoslv] <hugo.silva@lx.it.pt>
 - Rafael Silva [@rafaelscsilva](https://github.com/rafaelscsilva)
 - Sofia Monteiro [@sofia3ms](https://github.com/sofia3ms)
+- Afonso Raposo [@afonsocraposo] (https://github.com/afonsocraposo)
 - Patrícia Bota [@PatriciaBota](https://github.com/PatriciaBota)
 - Afonso Ferreira [@afonsof3rreira](https://github.com/afonsof3rreira)
 - Mariana Abreu [@MarianaAbreu](https://github.com/MarianaAbreu)
diff --git a/biosppy/plotting.py b/biosppy/plotting.py
index b2852ddd..2e4177a8 100644
--- a/biosppy/plotting.py
+++ b/biosppy/plotting.py
@@ -24,7 +24,7 @@
 import matplotlib.patches as patches
 import matplotlib.lines as lines
 import numpy as np
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 # local
 from . import utils
diff --git a/docs/conf.py b/docs/conf.py
index 1e41ce2f..98289df5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@
 sys.path.insert(0, os.path.abspath("../"))
 
 # To be able to import to ReadTheDocs
-from mock import Mock as MagicMock
+from unittest.mock import Mock as MagicMock
 
 
 class Mock(MagicMock):
@@ -38,7 +38,7 @@ def __getattr__(cls, name):
                 'scipy.spatial.distance', 'sklearn', 'sklearn.cluster',
                 'sklearn.model_selection', 'sklearn.externals',
                 'matplotlib.gridspec', 'h5py', 'shortuuid', 'bidict', 'svm',
-                'sksvm','pywt','joblib','scipy.linalg','scipy.integrate','scipy.ndimage']
+                'sksvm','pywt','joblib','scipy.linalg','scipy.integrate','scipy.ndimage','peakutils']
 
 sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)