Issues #50 e #37