Merge pull request #236 from masahirompp/master

#322, #372 対応
Merge pull request #237 from masahirompp/master

#312対応
#373対応