#403 #450 修正
Merge pull request #295 from jomjomni/master

#403 #450 修正