Resolves #30