Fixes #24
Fixes #23