Adjust scale to always display integers
Merge branch 'dev' into gh-pages