Issues #71 i #59