Addresses #42