Merge changes from @riconeitzel
Pull Request https://github.com/firegento/firegento-magesetup/pull/24