Addresses #82