Added a keypoints output to DescriptorExtractor
Merged patch on optional keypoints output