Addresses #98