Changes mage
Merge branch 'issue-2' into develop