Resolves #84