Resolves #24