Fix incorrect merge of README.md fixes

Pull request #390 was merged into master by mistake instead of #393
which obsoleted it (it mostly addressed review comments). This commit
attempts to fix that mistake and contains the diff between #390 and