Merge pull request #703 from t0t3m1n/fix_snr