Addresses #47