Issue61

Fixes issue #61