2.10.0 final

some generator tweaks perhaps only suitable for a final release
post factum fixes for future reference
Merge pull request #6 from adriaanm/2.10.0

2.10.0 final