Update README.md and merge with old README