Fixes #60
Fixes #58