Commit Inicial
Commit Inicial part 2
Merge branch 'master' into dev_varcal