Resolves #11 and #10