resolves #26