Fixed height/width bug
Merge branch 'master' into gh-pages
Update build