Changed paramater merge_linf_th to 1.5.
Changed angle_based_dist to 1.