Addresses #59