Updated to facebook branch of xctool.