fixed new conditional densities
Merge branch 'master' into npRmpi