scale to kristian pdf
Merge branch 'master' into mac