some changes
Merge pull request #1 from naoyawatanabe/branch1

some changes