Merge pull request #15 from salt-formulas/develop

Merge Develop to Master