Dev

@peterdesmet of you agree, this one can go to Master