DevelopToMaster

Merged Juan Carlos Alarcon M requested to merge develop into master

Merge Develop branch with the master to synchronize