Bringing github up to date