Issues #44 e #30