fix bugs
Merge branch 'develop' of github.com:MadeiraCloud/salt into develop