1st pull request from giuzmazza to gimazza

- giuzmazza has modified the file TODO
- giuzmazza has updated his local and remote repos
- giuzmazza is creating a pull request for gimazza