Test and fix for prev commit
Merge branch 'master' of https://github.com/magefree/mage