Resolves #87