諸々調整
削除
Merge branch 'master' into gh-pages