Addresses #116