Addresses #108