Addresses #26