Fixes #59
Fixes #60