Class time

Little reset
Test Feature
YES
Maybe it will work out
Merge branch 'develop'