as minhas alteraços
Merge origin/master