New class
Merge branch 'Faubricio'