Initial commit
Improve README
Fix README conflict