resolves #30