update the README, too
Merge branch 'master' into next