Addresses #40