Resolves #95