Fix
Fix conflict
Merge pull request #2 from hiroraba/initial_commit

Fix