Merge pull request #1 from MageTest/develop

Merge latest changes