modify
Merge pull request #6 from y-inoue-/conflict_test1_2_commit

modify