Fixes #8
Fixes #8 and Fixes #10