Resolves #86