Addresses #88