Windows and Mac for 2.0-beta1