Merge pull request #49 from salt-formulas/maxarnold-salt20183-fix

Maxarnold salt20183 fix (WIP)