Addresses #43