Merge branch 'master' into gh-pages
modified to match with mockup image
Merge branch 'gh-pages'