merge in changes from Arie Voors (of 4nec2)