Updated to 1.2