Se trae a develop lo último de master #7

Merged
kuru merged 3 commits from master into develop 5 years ago