some fix
Merge pull request #1 from miya0001/3.7

some fix
Merge pull request #2 from miya0001/master

?