Addresses #18.