Fix #889 #890 #891 #903

Merged Alexis Pineau requested to merge alexis.pineau/projet-2019:master into master Dec 24, 2019