Removing logging
Adding a form element for scale
Merge branch 'master' into gh-pages
Merging