Addresses #46