0.4.2a patch merge