Fixes #10
Fixes #11