Fixes #24
Fixes #22