fix on master
fix on master 2
fix on master 3
fix on master 4
Agrego new feature reseteado
Merge branch 'master' of https://github.com/WEREMSOFT/GitSandbox into newFeat
Merge branch 'newFeat' of https://github.com/WEREMSOFT/GitSandbox into newFeat