Added latest fixes, and the contributor to go with them

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>