Issue 61

fixes issue #61