README
Merge branch 'master' into Allan

* master:
  README