Resolves #8 and #10