sasajima update for tanaka conflict
Merge pull request #6 from rei-m/sasa02

sasajima update for tanaka conflict