Initial commit
Improve readme file
Fix merge conflict