Fixes #22
Fixes #27