Minor changes to the readme.
Merge branch 'master' into testing