Merge pull request #1 from dadayama/master

merge