merge from nrouzeaud + ignore private