Merge pull request #1 from satoyama/master

牧野です。よろしくお願いします。
Merge pull request #1 from mcmksh/master

Merge pull request #1 from satoyama/master