Resolves #92