Addresses #57.