Fixes #24
Fixes #20