Fixes #61
Fixes #57