Added automatic code rewriting into correct style
Merge branch 'development' of https://github.com/Phencys/magic into development