Resolves #25