Primer commit miramita
la embarre
Fixes
Merge pull request #4 from 3dves/JuanFelipeBranch

Juan felipe branch