Addresses #80