- fix non-ascii.
- mention recent changes
Merge remote-tracking branch 'upstream/master'