edit in mass(em andamento).
Merge remote-tracking branch 'origin/master'