Resolves #72