Mergre request from frank 2

Hey. Merge this one please. (10h27)