Issue61

closes #61