test
Merge pull request #1 from sotetsu/master

pull request test