Add SAR-swapping to sar_metric, Fix Issue #44 correctly