Add class
kill error
correct name
Merge remote-tracking branch 'origin/master'