ClassHelper now improved
Merge branch 'improvement-#5' into develop