merge de vista a master #43

Closed
fede wants to merge 16 commits from Vista into master