Merge pull request #56 from salt-formulas/develop

Merge develop branch to master