Ventanas II

Commit
Merge branch 'Carlos'