Good idea, that would be even better. unfortunately, atgeirr was too quick merging...

@atgeirr could you please hold of with merging until the discussion has been finished (this has been not a big issue this time, but the situation might be different next time)