Addresses #120