Class S:Zorg feature added :)

See #50
Avoid some possible mistabke with MG and attr

This is in class S
Avoid some possible issue in C for MG vs attr
Merge branch 'develop'