diff --git a/skimage/feature/censure.py b/skimage/feature/censure.py
index 89114a07..cd34e010 100644
--- a/skimage/feature/censure.py
+++ b/skimage/feature/censure.py
@@ -100,5 +100,6 @@ def censure_keypoints(image, mode='DoB', no_of_scales=7, threshold=0.03, rpc_thr
     for i in xrange(1, no_of_scales - 1):
         response[:, :, i] = _suppress_line(response[:, :, i], (1 + i / 3.0), rpc_threshold)
 
-    # TODO : Return key-points from all the scales?
-    return response
+    # Returning keypoints with its scale
+    keypoints = np.transpose(np.nonzero(response[:, :, 1:no_of_scales])) + [0, 0, 1]
+    return keypoints