Merge branch 'master' into gh-pages
better size
smiling fix and style embedded in html
Merge branch 'gh-pages'