Resolves #79