Issue #259

Hi Franz

What do you think of these changes?