Merge pull request #45 from EmaInfres5ED/valentinDev

Valentin dev