Update to Beta V0.36