Fixes bug 14
Merge branch 'master' of https://github.com/sdruskat/saltomic.git