Issue solved #65