I fixed the master's problem
Merge branch 'master' into r_myProject