Merge pull request #43 from salt-formulas/pr/38

Pr/38 - rebased