Fixes #11
Fixes #10