Resolves #23
Resolves #24