#146 #147 resolvidos