scale population and sample correctly
Merge branch 'master' into gh-pages
merge yscale fix