resolves #25