first commit sasajima
Fix confliction
Merge pull request #4 from naoya/feature/sasajima

first commit sasajima