Updated to CQv0.5.0