Issue78

Fixes issue #79