Resolves #85