Breaks old, makes more sensible.
Merge branch 'master' of https://github.com/0xcaca0/SaltCellar