Addresses #72