Inserted salvage load & parsing

See comments on your latest commit.
Merge pull request #11 from Dimpl/patch-3

Inserted salvage load & parsing