Addresses #74