Resolves #10