Addresses #113