fixing error using dummy rho in initialization
Merge branch 'master' into jm2/devel