Refactor match_descriptors and fix small bugs in ORB