Update to 4.2 - fixes #16