#8 resolvido
#3 pronto
merge