Addresses #84