Integrate GaelVaroquaux"s comments on PR.