Fixes #102
Fixes #97