Fixes #56
Fixes #57