Addresses #48