reviewed abstract
Merge branch 'master' into Juanmi
Reviewed acknowledgements
2c reviewed until line 41
Merge branch 'Juanmi' of https://github.com/kujta1/tema
improvments abstract