new class
Merge remote-tracking branch 'lala/master'