Demo version 2
add new clas
Merge remote-tracking branch 'origin/develop' into develop