Resolves #90