Included is the SNR model from Karl. @Karl: Is that right so? If so, can you merge this into master?
