updated classes
Merge remote-tracking branch 'origin/teste' into remoteBranch