Fix README
fix conflict
Merge pull request #30 from kubo39/Fix-Readme

Fix README