#132 #131 resolvidos