Merge branch 'rscale' into 'master'

Scale expansion coefficients with expansion radius

See merge request !46