Merge pull request #1 from ytake/master

1