Merge pull request #1 from ytake/master

Master
fixed
Merge pull request #3 from ytake/4.2-update

fixed
Merge pull request #4 from ytake/4.2

4.2