Update README.md
Merge remote-tracking branch 'cfa/master' into development