Salvage is Trace2, not Trace3
Merge pull request #220 from Kiv/master

Salvage is Trace2, not Trace3