Merge branch 'master' into gh-pages
using sticky icon
Merge branch 'gh-pages'