for conflict
Merge pull request #7 from rei-m/sasa03

for conflict