Addresses #36