merge test
Merge pull request #1 from sugimo/feature

ok