Fixed README typos.
Improved generic parameter handling.