Fixes #9 and #10 .
Fixes #9 and #10 .