updates
Merge pull request #5 from andresarenasv/pablo

updates
Merge pull request #4 from andresarenasv/andres

Andres
updates2
Merge pull request #6 from andresarenasv/pablo

updates2
temps
conflicts fixes