Fixing merge errors.
Minor README.md improvement.