Issue 451

Hi,

can you please merge this into the master

Thanks,
 Stefan