Add Matteo's email
Merge remote-tracking branch 'origin/pr/3' into feature/pjl