diff --git a/bob/ip/facelandmarks/utils.py b/bob/ip/facelandmarks/utils.py
index b86638b37ed3ee27590fd6318127ba1124e5938d..d9d3cd465af3d4500af505f5b6aad118fb5ee204 100644
--- a/bob/ip/facelandmarks/utils.py
+++ b/bob/ip/facelandmarks/utils.py
@@ -186,7 +186,7 @@ def _detect_multiple_landmarks_on_gray_image(data, top=0, min_quality=0.):
 
   Returns:
 
-    list: A list of named tuples of type :py:class:`bob.ip.facelandmarks.utils.Result`, each containing
+    list: A list of named tuples of type :py:class:`.utils.Result`, each containing
       the result of face detection and landmarks extracted from the input
       image.
       The list MAY BE EMPTY if no face is detected in the input image (data).
@@ -278,7 +278,7 @@ def _detect_multiple_landmarks_on_color_image(data, top=0, min_quality=0.):
 
   Returns:
 
-    list: A list of named tuples of type :py:class:`bob.ip.facelandmarks.utils.Result`, each containing
+    list: A list of named tuples of type :py:class:`.utils.Result`, each containing
       the result of face detection and landmarks extracted from the input
       image.
 
@@ -313,7 +313,7 @@ def detect_landmarks(data, top=0, min_quality=0.):
 
   Returns:
 
-    list: A list of named tuples of type :py:class:`bob.ip.facelandmarks.utils.Result`, each containing
+    list: A list of named tuples of type :py:class:`.utils.Result`, each containing
       the result of face detection and landmarks extracted from the input
       image.
 
@@ -335,7 +335,7 @@ def draw_landmarks(data, results):
       dimensions, corresponding to a either a gray-scale or color image loaded
       with Bob.
 
-    results (list): A list of named tuples of type :py:class:`bob.ip.facelandmarks.utils.Result`, each
+    results (list): A list of named tuples of type :py:class:`.utils.Result`, each
       containing the result of face detection and landmarks extracted from the
       input image.
 
@@ -395,7 +395,7 @@ def save_landmarks(results, fname):
 
   Parameters:
 
-    results (list): A list of named tuples of type :py:class:`bob.ip.facelandmarks.utils.Result`, each
+    results (list): A list of named tuples of type :py:class:`.utils.Result`, each
       containing the result of face detection and landmarks extracted from the
       input image.
 
diff --git a/doc/index.rst b/doc/index.rst
index 034ebfbe4d62e16a8dc9fafcd24eb19261648589..1b8c050e95e704ccffe729f75640111b1ba21b04 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -2,9 +2,9 @@
 .. Andre Anjos <andre.anjos@idiap.ch>
 .. Tue 16 Feb 2016 15:42:29 CET
 
-=======================================================
+========================================================
  Bob's Routines for Face Landmark Detection using Menpo
-=======================================================
+========================================================
 
 .. todolist::
 
diff --git a/doc/nitpick-exceptions.txt b/doc/nitpick-exceptions.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6a5cf99416be345dfb2c382a81cb533e8a01e48d
--- /dev/null
+++ b/doc/nitpick-exceptions.txt
@@ -0,0 +1 @@
+py:class collections.namedtuple
diff --git a/doc/py_api.rst b/doc/py_api.rst
index 009821f1ee02ae9c18e4d195124ab1436c78dbbb..2abe2eda451d17efb6a6517e875317ec71c622bd 100644
--- a/doc/py_api.rst
+++ b/doc/py_api.rst
@@ -1,7 +1,4 @@
 .. vim: set fileencoding=utf-8 :
-.. Manuel Guenther <manuel.guenther@idiap.ch>
-.. Wed 14 Jan 16:15:27 CET 2015
-
 
 ============
  Python API
@@ -10,4 +7,4 @@
 Detailed Information
 --------------------
 
-.. automodule:: bob.ip.facelandmarks
+.. automodule:: bob.ip.facelandmarks.utils
diff --git a/setup.py b/setup.py
index fbef3cc048d3d4e2415b589099a33fc66a89e35e..4672090e895eee68c442e2d4b219be6b16893424 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,8 @@ setup(
     author='Andre Anjos',
     author_email='andre.anjos@idiap.ch',
     keywords='bob, keypoint detection, face',
+    maintainer="Sushil Bhattacharjee"
+    maintainer_email="sbhatta@idiap.ch"
 
     long_description=open('README.rst').read(),