branch riccardo
changed on master
merge with riccardo
changed maste