Merge branch 'gh-pages'

confirm the change made on the setting button