闇火、闇水追加
Merge branch 'master' into gh-pages