Merge pull request #1 from debops/master

Merge pull request #37 from drybjed/add-salt
Merge pull request #38 from drybjed/add-salt

Merge pull request #1 from debops/master