Addresses #31.