Update README
Merge branch 'master' into with-node-modules

* master:
  Update README