Added my changes, check readme for details.

Sadly these are not separate commits as I did not have version control at the time.