Addresses #52