Fixes #10
Fixes #8