Addresses #104