Resolves #10
Resolves #10