fix for #380
Merge pull request #381 from leider/master

fix for #380