last version review
Merge branch 'master' of https://github.com/MarioCerdan/Thesis