Merge pull request #6 from Elgatomontes/feature/TP1

Feature/tp1
Merge pull request #8 from Elgatomontes/private/Gaston/TP1

Merge pull request #6 from Elgatomontes/feature/TP1