Ultima version funcional
Merge branch 'master' into Noel_Branch