Modified a little
Resolve a conflict
Merge pull request #3 from KataokaSeiichi/hoge

Modified a little