Addresses #103