Fixed conflict generated by github merge
Merge pull request #34 from MageTest/feature/refactor

Fixed conflict generated by github merge