Resolves #78