Resolve as issues #49 e #33