merge test
Merge pull request #2 from sako1847/testcode

merge test