Merge pull request #379 from leider/master

two small fixes (very hot)
fix for #380