Fixes #10 and Fixes #9