Merge pull request #3 from ytake/master

1