Fixes
Merge branch 'master' of github.com:chiara-paci/santaclara-third