Class S: refacto of magic getters part
Class S: removed deprecated method
Minor changes
Merge branch 'develop'