Addresses #105