Ported to new Salvage Window based on Carbine diffs.
Merge pull request #20 from Therzok/newSalvage

Ported to new Salvage Window based on Carbine diffs.