* resolves #26