resolves #24