modified height
fixed doctype
Merge branch 'master' into gh-pages