Fixes #20
Fixes #17