Addresses #100