Syncing readme.md file with upstream
Changes and added content to doc.html
fix merge conflict in README.md