resolvido issues #25 e #26