Merge pull request #25 from EmaInfres5ED/valentinDev

Valentin dev