diff --git a/bob/db/cuhk_cufsf/query.py b/bob/db/cuhk_cufsf/query.py
index 86cfa278852b9680486dd007707870496c11ae7f..91d64fea66341c5e997d6ef6d7e5bc5408282cea 100755
--- a/bob/db/cuhk_cufsf/query.py
+++ b/bob/db/cuhk_cufsf/query.py
@@ -33,14 +33,16 @@ class Database(bob.db.base.SQLiteDatabase):
 
   """Wrapper class for the CUHK-CUFSF database for Heterogeneous face recognition recognition (http://mmlab.ie.cuhk.edu.hk/archive/cufsf/).
   
-   Parameters:
-   -----------
+   **Parameters**
+
       original_directory: str
          The CUHK-CUFS path
+         
       original_extension: str
          The extension of the image files (**A list of possible extensions is acceptable**)
+         
       feret_directory: str
-         The CUHK-CUFS path      
+         The CUHK-CUFS path
   """
 
   def __init__(self, original_directory = None, original_extension = None, feret_directory = None):
diff --git a/doc/nitpick-exceptions.txt b/doc/nitpick-exceptions.txt
index 5c331f3c02275c6f7e034772de0a540e460b5c01..ec94da194524712a6158def2732eb52562cdb1cf 100644
--- a/doc/nitpick-exceptions.txt
+++ b/doc/nitpick-exceptions.txt
@@ -1,2 +1,6 @@
 py:class sqlalchemy.ext.declarative.api.Base
 py:exc ValueError
+
+# This is not documented as py:exc in Python 2.7 - works in Python 3.x
+py:obj list
+py:class list