Update and improve the readme a bit
Merge remote-tracking branch 'origin/2.10.0' into 2.10.0
Fix misnamed method in Generator (thanks to Ben Hutchison).

Fixes #116