Resolves #80