Addresses #71