for conflict
Merge pull request #10 from rei-m/sasa04

for conflict