Resolves #16
Resolves #15