Update
Merge pull request #4 from sanemat/fix/salvaged

Update