Merge in changes from the master branch to README.md