Made it easier to select height and width
Merge branch 'master' into gh-pages
Updated