Fixes #61
Fixes #62