Merged Master with SciCal