ToDo update
Merge pull request #34 from cravacuore/develop

ToDo update