Resolves #98