ok -- will merge now then

we just shouldn't forget about all that ;-)