Addresses #46.