Addresses #101