Develop

Cleaned up the commit made by Lorena, to have a clean merge.