Merge pull request #1 from RoboGroup3/master

Last updates from Valeria