issues solved #115