Resolves #89