Salt
Better formulation
Pros and cons
Merge branch 'master' into salt
Merge branch 'salt'