Fixes #101
Fixes #100