Merge pull request #812 from hurtonm/master

Make it explicit that the probe function doesn't modify passed message
Fix some comments regarding method overriding