Merge branch 'feature/magicFieldAndElement' into develop
Merge pull request #5 from Eji4h/develop

Merge branch 'feature/magicFieldAndElement' into develop