Improve README a bit more.
Merge remote-tracking branch 'upstream/master'